Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make proper native theme observer gets native theme change noti (uplift to 0.65.x) #2331

Merged

Conversation

brave-builds
Copy link
Collaborator

@brave-builds brave-builds commented Apr 24, 2019

Uplift of #2219
Issue: brave/brave-browser#4059

@simonhong
Copy link
Member

@bsclifton Can you help to pass this PR on builder?
Below is the error log. (#2332 has also same error log)

22:19:21  git -C /Users/jenkins/jenkins/workspace/os_theme_with_brave_theme_0.65.x/src clean -f
22:19:24  git -C /Users/jenkins/jenkins/workspace/os_theme_with_brave_theme_0.65.x/src reset --hard refs/tags/74.0.3729.108
22:19:32  git -C /Users/jenkins/jenkins/workspace/os_theme_with_brave_theme_0.65.x/src/brave fetch --all --tags
22:19:32  Fetching origin
22:19:32  error: refs/heads/TEMP_LINT_BRANCH_1 does not point to a valid object!
22:19:32  error: refs/heads/TEMP_LINT_BRANCH_2 does not point to a valid object!
22:19:32  error: refs/remotes/origin/0.55.x-reltest does not point to a valid object!
22:19:32  error: refs/remotes/origin/0.59.x-3077 does not point to a valid object!
22:19:32  error: refs/remotes/origin/0.59.x-3165 does not point to a valid object!
22:19:32  error: refs/remotes/origin/0.59.x-3192 does not point to a valid object!
22:19:32  error: refs/remotes/origin/0.59.x-revert-beta-title does not point to a valid object!

@bsclifton
Copy link
Member

Will look at this soon- likely a Git cache issue

@bsclifton bsclifton force-pushed the pr2219_align_windows_os_theme_with_brave_theme_0.65.x branch from 25830f7 to 6d01e52 Compare May 7, 2019 20:28
@bsclifton
Copy link
Member

Rebased - will watch CI

@bsclifton
Copy link
Member

Tests run/pass on Linux and macOS; Windows runs into this problem:
https://staging.ci.brave.com/job/brave-browser-build-pr/job/pr2219_align_windows_os_theme_with_brave_theme_0.65.x/1/execution/node/222/log/

14:36:28  C:\jenkins\workspace\os_theme_with_brave_theme_0.65.x\src\out\Release>python ..\..\brave\script\redirect-cc.py ../../third_party/llvm-build/Release+Asserts/bin/clang-cl.exe /nologo /showIncludes  "-imsvc..\..\..\..\..\..\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Tools\MSVC\14.16.27023\ATLMFC\include" "-imsvc..\..\..\..\..\..\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Tools\MSVC\14.16.27023\include" "-imsvc..\..\..\..\..\..\Program Files (x86)\Windows Kits\NETFXSDK\4.6.1\include\um" "-imsvc..\..\..\..\..\..\Program Files (x86)\Windows Kits\10\include\10.0.17763.0\ucrt" "-imsvc..\..\..\..\..\..\Program Files (x86)\Windows Kits\10\include\10.0.17763.0\shared" "-imsvc..\..\..\..\..\..\Program Files (x86)\Windows Kits\10\include\10.0.17763.0\um" "-imsvc..\..\..\..\..\..\Program Files (x86)\Windows Kits\10\include\10.0.17763.0\winrt" "-imsvc..\..\..\..\..\..\Program Files (x86)\Windows Kits\10\include\10.0.17763.0\cppwinrt" -DBRAVE_CHROMIUM_BUILD -DUSE_AURA=1 -DNO_TCMALLOC -DFULL_SAFE_BROWSING -DSAFE_BROWSING_CSD -DSAFE_BROWSING_DB_LOCAL -DOFFICIAL_BUILD -DCHROMIUM_BUILD "-DCR_CLANG_REVISION=\"351477-1\"" -D_HAS_NODISCARD -D_HAS_EXCEPTIONS=0 -D__STD_C -D_CRT_RAND_S -D_CRT_SECURE_NO_DEPRECATE -D_SCL_SECURE_NO_DEPRECATE -D_ATL_NO_OPENGL -D_WINDOWS -DCERT_CHAIN_PARA_HAS_EXTRA_FIELDS -DPSAPI_VERSION=2 -DWIN32 -D_SECURE_ATL -D_USING_V110_SDK71_ -DWINAPI_FAMILY=WINAPI_FAMILY_DESKTOP_APP -DWIN32_LEAN_AND_MEAN -DNOMINMAX -D_UNICODE -DUNICODE -DNTDDI_VERSION=0x0A000003 -D_WIN32_WINNT=0x0A00 -DWINVER=0x0A00 -DNDEBUG -DNVALGRIND -DDYNAMIC_ANNOTATIONS_ENABLED=0 -DBLINK_MODULES_IMPLEMENTATION=1 -DBLINK_IMPLEMENTATION=1 -DINSIDE_BLINK -DWEBP_EXTERN=extern -DUSE_EGL -DWEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS=0 -DWEBRTC_CHROMIUM_BUILD -DWEBRTC_WIN -DABSL_ALLOCATOR_NOTHROW=1 -DNO_MAIN_THREAD_WRAPPING -DU_USING_ICU_NAMESPACE=0 -DU_ENABLE_DYLOAD=0 -DUSE_CHROMIUM_ICU=1 -DU_STATIC_IMPLEMENTATION -DICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_FILE -DUCHAR_TYPE=wchar_t -DGOOGLE_PROTOBUF_NO_RTTI -DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER -DSK_HAS_PNG_LIBRARY -DSK_HAS_WEBP_LIBRARY -DSK_HAS_JPEG_LIBRARY -DSK_SUPPORT_GPU=1 "-DSK_GPU_WORKAROUNDS_HEADER=\"gpu/config/gpu_driver_bug_workaround_autogen.h\"" -DGR_GL_FUNCTION_TYPE=__stdcall -DV8_DEPRECATION_WARNINGS -DLEVELDB_PLATFORM_CHROMIUM=1 -DDeleteFile=DeleteFileW -DLEVELDB_PLATFORM_CHROMIUM=1 -DWTF_USE_WEBAUDIO_FFMPEG=1 -DSUPPORT_WEBGL2_COMPUTE_CONTEXT=1 -DWTF_USE_DEFAULT_RENDER_THEME=1 -DUSE_LIBJPEG_TURBO=1 -DV8_DEPRECATION_WARNINGS -DLIBXSLT_STATIC -I../../brave/chromium_src -I../.. -Igen -I../../third_party/libyuv/include -I../../third_party/libwebp/src -I../../third_party/wtl/include -I../../third_party/khronos -I../../gpu -I../../third_party/webrtc_overrides -I../../third_party/webrtc -Igen/third_party/webrtc -I../../third_party/abseil-cpp -I../../third_party/ced/src -I../../third_party/icu/source/common -I../../third_party/icu/source/i18n -I../../third_party/protobuf/src -I../../third_party/protobuf/src -Igen/protoc_out -I../../third_party/boringssl/src/include -I../../skia/config -I../../skia/ext -I../../third_party/skia/include/c -I../../third_party/skia/include/codec -I../../third_party/skia/include/config -I../../third_party/skia/include/core -I../../third_party/skia/include/docs -I../../third_party/skia/include/effects -I../../third_party/skia/include/encode -I../../third_party/skia/include/gpu -I../../third_party/skia/include/pathops -I../../third_party/skia/include/ports -I../../third_party/skia/include/utils -I../../third_party/skia/src/gpu -I../../third_party/skia/src/sksl -I../../third_party/skia/modules/skottie/include -I../../third_party/angle/include -I../../third_party/angle/src/common/third_party/base -Igen/angle -I../../third_party/angle/include -I../../v8/include -Igen/v8/include -I../../third_party/libwebm/source -I../../third_party/leveldatabase -I../../third_party/leveldatabase/src -I../../third_party/leveldatabase/src/include -I../../third_party/libjpeg_turbo -I../../third_party/iccjpeg -I../../third_party/libpng -I../../third_party/zlib -I../../third_party/ots/include -I../../v8/include -Igen/v8/include -I../../third_party/libxml/src/include -I../../third_party/libxml/win32/include -I../../third_party/libxslt/src -I../../third_party/snappy/src -I../../third_party/snappy/win32 /utf-8 /X -fcolor-diagnostics -fmerge-all-constants -Xclang -mllvm -Xclang -instcombine-lower-dbg-declare=0 -fcomplete-member-pointers /Gy /FS /bigobj /d2FastFail /Zc:sizedDealloc- -fmsc-version=1911 -m64 /Brepro -Xclang -fdebug-compilation-dir -Xclang . -no-canonical-prefixes /W4 -Wimplicit-fallthrough -Wthread-safety /WX /wd4091 /wd4127 /wd4251 /wd4275 /wd4312 /wd4324 /wd4351 /wd4355 /wd4503 /wd4589 /wd4611 /wd4100 /wd4121 /wd4244 /wd4505 /wd4510 /wd4512 /wd4610 /wd4838 /wd4995 /wd4996 /wd4456 /wd4457 /wd4458 /wd4459 /wd4200 /wd4201 /wd4204 /wd4221 /wd4245 /wd4267 /wd4305 /wd4389 /wd4702 /wd4701 /wd4703 /wd4661 /wd4706 /wd4715 /wd4702 -Wno-missing-field-initializers -Wno-unused-parameter -Wno-c++11-narrowing -Wno-unneeded-internal-declaration -Wno-undefined-var-template -Wno-nonportable-include-path -Wno-ignored-pragma-optimize /O1 /Ob2 /Oy- /Zc:inline /Gw /Oi /MT -Xclang -add-plugin -Xclang find-bad-constructs -Wheader-hygiene -Wstring-conversion -Wtautological-overlap-compare -Wno-shorten-64-to-32 /wd4305 /wd4324 /wd4714 /wd4800 /wd4996 -Xclang -add-plugin -Xclang blink-gc-plugin -Wglobal-constructors -Wconversion -Wno-float-conversion -Wno-sign-conversion -Wno-implicit-float-conversion -Wno-implicit-int-conversion /Z7 -fno-standalone-debug -Wno-inconsistent-missing-override /wd4344 -DLIBXML_STATIC= /TP /wd4577 /GR- /c ../../third_party/blink/renderer/modules/peerconnection/rtc_rtp_transceiver.cc /Foobj/third_party/blink/renderer/modules/peerconnection/peerconnection/rtc_rtp_transceiver.obj /Fd"obj/third_party/blink/renderer/modules/peerconnection/peerconnection_cc.pdb" 
14:36:28  ninja: build stopped: subcommand failed.
14:36:28  null
14:36:28  powershell.exe : null
14:36:28  At C:\jenkins\workspace\os_theme_with_brave_theme_0.65.x@tmp\durable-f5d3bcc9\powershellWrapper.ps1:3 char:1
14:36:28  + & powershell -NoProfile -NonInteractive -ExecutionPolicy Bypass -Comm ...
14:36:28  + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
14:36:28      + CategoryInfo          : NotSpecified: (null:String) [], RemoteException
14:36:28      + FullyQualifiedErrorId : NativeCommandError

@bsclifton
Copy link
Member

Root problem discovered and captured in brave/brave-browser#4343

@petemill attempted a solution in #2384

Would be good to know if this happens on Windows with raw 0.65.x branch or if we just got lucky with this PR (causing the conditions that triggered the error)

@simonhong simonhong force-pushed the pr2219_align_windows_os_theme_with_brave_theme_0.65.x branch from 6d01e52 to c4f3757 Compare May 9, 2019 00:57
@simonhong
Copy link
Member

Rebased and re-run Builder and only lint check was failed.
I think we can merge this?

Copy link
Member

@kjozwiak kjozwiak left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Uplift to 0.65.x approved after deliberating with @srirambv. Please ensure that all the correct labels are being used and the appropriate issue(s) are moved into the correct milestone.

@simonhong simonhong merged commit 42bd536 into 0.65.x May 10, 2019
@simonhong simonhong deleted the pr2219_align_windows_os_theme_with_brave_theme_0.65.x branch May 10, 2019 02:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants