diff --git a/CHROMIUM_BUILD_COMPATIBILITY.txt b/CHROMIUM_BUILD_COMPATIBILITY.txt index 29700270f..48482133c 100644 --- a/CHROMIUM_BUILD_COMPATIBILITY.txt +++ b/CHROMIUM_BUILD_COMPATIBILITY.txt @@ -7,5 +7,5 @@ # https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding { - 'chromium_checkout': 'refs/tags/60.0.3112.78', + 'chromium_checkout': 'refs/tags/60.0.3112.90', } diff --git a/libcef/common/crash_reporter_client.cc b/libcef/common/crash_reporter_client.cc index 3c34f6116..f1d0af827 100644 --- a/libcef/common/crash_reporter_client.cc +++ b/libcef/common/crash_reporter_client.cc @@ -476,8 +476,7 @@ void CefCrashReporterClient::InitializeCrashReportingForProcess() { !g_crash_reporter_client->HasCrashExternalHandler(); if (embedded_handler) { crash_reporter::InitializeCrashpadWithEmbeddedHandler( - process_type.empty(), install_static::UTF16ToUTF8(process_type), - std::string()); + process_type.empty(), install_static::UTF16ToUTF8(process_type)); } else { crash_reporter::InitializeCrashpad( process_type.empty(), install_static::UTF16ToUTF8(process_type)); diff --git a/patch/patches/crashpad_1995.patch b/patch/patches/crashpad_1995.patch index 6a7b9740f..3f7501a76 100644 --- a/patch/patches/crashpad_1995.patch +++ b/patch/patches/crashpad_1995.patch @@ -423,10 +423,10 @@ index 9f69c19..2abaee00 100644 } // namespace crash_reporter diff --git components/crash/content/app/crashpad.cc components/crash/content/app/crashpad.cc -index ba04da1..aa3f21a 100644 +index dcec346..6272df6 100644 --- components/crash/content/app/crashpad.cc +++ components/crash/content/app/crashpad.cc -@@ -143,7 +143,8 @@ void InitializeCrashpadImpl(bool initial_client, +@@ -142,7 +142,8 @@ void InitializeCrashpadImpl(bool initial_client, // fallback. Forwarding is turned off for debug-mode builds even for the // browser process, because the system's crash reporter can take a very long // time to chew on symbols. @@ -437,7 +437,7 @@ index ba04da1..aa3f21a 100644 crashpad::TriState::kDisabled); } diff --git components/crash/content/app/crashpad_mac.mm components/crash/content/app/crashpad_mac.mm -index 485c2b4..3b5f3ea 100644 +index 3bae07e..b2bee0e 100644 --- components/crash/content/app/crashpad_mac.mm +++ components/crash/content/app/crashpad_mac.mm @@ -16,11 +16,14 @@ @@ -455,7 +455,7 @@ index 485c2b4..3b5f3ea 100644 #include "third_party/crashpad/crashpad/client/crash_report_database.h" #include "third_party/crashpad/crashpad/client/crashpad_client.h" #include "third_party/crashpad/crashpad/client/crashpad_info.h" -@@ -42,9 +45,10 @@ base::FilePath PlatformCrashpadInitialization( +@@ -40,9 +43,10 @@ base::FilePath PlatformCrashpadInitialization(bool initial_client, if (initial_client) { @autoreleasepool { @@ -469,7 +469,7 @@ index 485c2b4..3b5f3ea 100644 // Is there a way to recover if this fails? CrashReporterClient* crash_reporter_client = GetCrashReporterClient(); -@@ -56,16 +60,27 @@ base::FilePath PlatformCrashpadInitialization( +@@ -54,16 +58,27 @@ base::FilePath PlatformCrashpadInitialization(bool initial_client, // crash server won't have symbols for any other build types. std::string url = "https://clients2.google.com/cr/report"; #else @@ -502,7 +502,7 @@ index 485c2b4..3b5f3ea 100644 #if defined(GOOGLE_CHROME_BUILD) // Empty means stable. -@@ -81,12 +96,16 @@ base::FilePath PlatformCrashpadInitialization( +@@ -79,12 +94,16 @@ base::FilePath PlatformCrashpadInitialization(bool initial_client, process_annotations["channel"] = ""; } @@ -524,7 +524,7 @@ index 485c2b4..3b5f3ea 100644 std::vector arguments; -@@ -108,6 +127,12 @@ base::FilePath PlatformCrashpadInitialization( +@@ -106,6 +125,12 @@ base::FilePath PlatformCrashpadInitialization(bool initial_client, "--reset-own-crash-exception-port-to-system-default"); } @@ -538,7 +538,7 @@ index 485c2b4..3b5f3ea 100644 handler_path, database_path, metrics_path, url, process_annotations, arguments, true, false); diff --git components/crash/content/app/crashpad_win.cc components/crash/content/app/crashpad_win.cc -index 6fdfd83..1d5a2a9 100644 +index 94a350f..09fce54 100644 --- components/crash/content/app/crashpad_win.cc +++ components/crash/content/app/crashpad_win.cc @@ -33,8 +33,8 @@ void GetPlatformCrashpadAnnotations( @@ -564,7 +564,7 @@ index 6fdfd83..1d5a2a9 100644 #endif } -@@ -82,7 +82,7 @@ base::FilePath PlatformCrashpadInitialization( +@@ -80,7 +80,7 @@ base::FilePath PlatformCrashpadInitialization(bool initial_client, #if defined(GOOGLE_CHROME_BUILD) std::string url = "https://clients2.google.com/cr/report"; #else @@ -573,7 +573,7 @@ index 6fdfd83..1d5a2a9 100644 #endif // Allow the crash server to be overridden for testing. If the variable -@@ -102,13 +102,14 @@ base::FilePath PlatformCrashpadInitialization( +@@ -100,22 +100,26 @@ base::FilePath PlatformCrashpadInitialization(bool initial_client, crashpad::TriState::kEnabled, kIndirectMemoryLimit); } @@ -581,19 +581,19 @@ index 6fdfd83..1d5a2a9 100644 - // reinvoke it with --type=crashpad-handler. Otherwise, we use the - // standalone crashpad_handler.exe (for tests, etc.). std::vector start_arguments; +- if (embedded_handler) { +- start_arguments.push_back(std::string("--type=") + +- switches::kCrashpadHandler); + + // Always add --type=crashpad-handler because the value is expected by + // CefExecuteProcess. + start_arguments.push_back( + std::string("--type=") + switches::kCrashpadHandler); + - if (embedded_handler) { -- start_arguments.push_back(std::string("--type=") + -- switches::kCrashpadHandler); - if (!user_data_dir.empty()) { - start_arguments.push_back(std::string("--user-data-dir=") + - user_data_dir); -@@ -119,9 +120,12 @@ base::FilePath PlatformCrashpadInitialization( ++ if (embedded_handler) { + // The prefetch argument added here has to be documented in + // chrome_switches.cc, below the kPrefetchArgument* constants. A constant + // can't be used here because crashpad can't depend on Chrome. start_arguments.push_back("/prefetch:7"); } else { base::FilePath exe_dir = exe_file.DirName(); diff --git a/patch/patches/webkit_popups.patch b/patch/patches/webkit_popups.patch index f1b7e14f5..8e6d4d81c 100644 --- a/patch/patches/webkit_popups.patch +++ b/patch/patches/webkit_popups.patch @@ -12,10 +12,10 @@ index ed45829..a43bd1e 100644 virtual GraphicsLayer* RootGraphicsLayer() = 0; virtual void RegisterViewportLayersWithCompositor() = 0; diff --git third_party/WebKit/Source/web/ChromeClientImpl.cpp third_party/WebKit/Source/web/ChromeClientImpl.cpp -index 2a35f2c..dded520 100644 +index 9ff6994..d310a87 100644 --- third_party/WebKit/Source/web/ChromeClientImpl.cpp +++ third_party/WebKit/Source/web/ChromeClientImpl.cpp -@@ -935,7 +935,7 @@ PopupMenu* ChromeClientImpl::OpenPopupMenu(LocalFrame& frame, +@@ -928,7 +928,7 @@ PopupMenu* ChromeClientImpl::OpenPopupMenu(LocalFrame& frame, return nullptr; NotifyPopupOpeningObservers(); @@ -25,10 +25,10 @@ index 2a35f2c..dded520 100644 DCHECK(RuntimeEnabledFeatures::pagePopupEnabled()); diff --git third_party/WebKit/Source/web/WebViewImpl.cpp third_party/WebKit/Source/web/WebViewImpl.cpp -index bd1490b..80b61b8 100644 +index 3e58637..6d89fa1 100644 --- third_party/WebKit/Source/web/WebViewImpl.cpp +++ third_party/WebKit/Source/web/WebViewImpl.cpp -@@ -353,6 +353,7 @@ WebViewImpl::WebViewImpl(WebViewClient* client, +@@ -354,6 +354,7 @@ WebViewImpl::WebViewImpl(WebViewClient* client, enable_fake_page_scale_animation_for_testing_(false), fake_page_scale_animation_page_scale_factor_(0), fake_page_scale_animation_use_anchor_(false), @@ -36,7 +36,7 @@ index bd1490b..80b61b8 100644 compositor_device_scale_factor_override_(0), suppress_next_keypress_event_(false), ime_accept_events_(true), -@@ -3689,12 +3690,13 @@ void WebViewImpl::MainFrameScrollOffsetChanged() { +@@ -3694,12 +3695,13 @@ void WebViewImpl::MainFrameScrollOffsetChanged() { dev_tools_emulator_->MainFrameScrollOrScaleChanged(); }