From d8a577c0f15f4ca91f0ca442d5c733daac36acea Mon Sep 17 00:00:00 2001 From: Marshall Greenblatt Date: Wed, 31 Jul 2019 17:05:17 -0400 Subject: [PATCH] Update to Chromium version 76.0.3809.87 --- CHROMIUM_BUILD_COMPATIBILITY.txt | 2 +- patch/patches/content_2015.patch | 6 +++--- patch/patches/gn_config.patch | 4 ++-- patch/patches/linux_gtk_2014.patch | 6 +++--- patch/patches/storage_incognito_2289.patch | 4 ++-- patch/patches/views_widget_180_1481_1565_1677_1749.patch | 2 +- patch/patches/webkit_plugin_info_2015.patch | 2 +- patch/patches/win_rt_2274.patch | 4 ++-- 8 files changed, 15 insertions(+), 15 deletions(-) diff --git a/CHROMIUM_BUILD_COMPATIBILITY.txt b/CHROMIUM_BUILD_COMPATIBILITY.txt index ea20a9d27..5bb3f0dd9 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/76.0.3809.62' + 'chromium_checkout': 'refs/tags/76.0.3809.87' } diff --git a/patch/patches/content_2015.patch b/patch/patches/content_2015.patch index c398573a7..ac880bff4 100644 --- a/patch/patches/content_2015.patch +++ b/patch/patches/content_2015.patch @@ -278,10 +278,10 @@ index e5bcd550ade9..78657a4f5a64 100644 std::string /* mime_type */, bool /* found */, diff --git content/public/browser/content_browser_client.h content/public/browser/content_browser_client.h -index 1a16897afa44..12439a93b151 100644 +index a2ef727d3a61..b3e7964beeca 100644 --- content/public/browser/content_browser_client.h +++ content/public/browser/content_browser_client.h -@@ -1437,6 +1437,15 @@ class CONTENT_EXPORT ContentBrowserClient { +@@ -1450,6 +1450,15 @@ class CONTENT_EXPORT ContentBrowserClient { network::mojom::URLLoaderFactoryRequest* factory_request, network::mojom::URLLoaderFactory*& out_factory); @@ -297,7 +297,7 @@ index 1a16897afa44..12439a93b151 100644 // Creates an OverlayWindow to be used for Picture-in-Picture. This window // will house the content shown when in Picture-in-Picture mode. This will // return a new OverlayWindow. -@@ -1504,6 +1513,10 @@ class CONTENT_EXPORT ContentBrowserClient { +@@ -1517,6 +1526,10 @@ class CONTENT_EXPORT ContentBrowserClient { // Used as part of the user agent string. virtual std::string GetProduct() const; diff --git a/patch/patches/gn_config.patch b/patch/patches/gn_config.patch index e0b1aeff6..45d63b057 100644 --- a/patch/patches/gn_config.patch +++ b/patch/patches/gn_config.patch @@ -1,8 +1,8 @@ diff --git .gn .gn -index 01085ea84619..b79158a1a962 100644 +index 262f1b071b98..48452ac13306 100644 --- .gn +++ .gn -@@ -666,6 +666,8 @@ exec_script_whitelist = +@@ -665,6 +665,8 @@ exec_script_whitelist = # in the Chromium repo outside of //build. "//build_overrides/build.gni", diff --git a/patch/patches/linux_gtk_2014.patch b/patch/patches/linux_gtk_2014.patch index ea084655e..42f95a59b 100644 --- a/patch/patches/linux_gtk_2014.patch +++ b/patch/patches/linux_gtk_2014.patch @@ -39,10 +39,10 @@ index 07f06ac694f5..831fd9f82dbe 100644 void ChromeBrowserMainExtraPartsViewsLinux::ToolkitInitialized() { diff --git chrome/test/BUILD.gn chrome/test/BUILD.gn -index d637b306110b..7996770352d4 100644 +index 3010ca862ab0..10f7c341be43 100644 --- chrome/test/BUILD.gn +++ chrome/test/BUILD.gn -@@ -4288,7 +4288,7 @@ test("unit_tests") { +@@ -4285,7 +4285,7 @@ test("unit_tests") { if (use_gio) { configs += [ "//build/linux:gio_config" ] } @@ -51,7 +51,7 @@ index d637b306110b..7996770352d4 100644 deps += [ "//chrome/browser/ui/libgtkui" ] } -@@ -5289,7 +5289,7 @@ if (!is_android) { +@@ -5286,7 +5286,7 @@ if (!is_android) { # suites, it seems like one or another starts timing out too. "../browser/ui/views/keyboard_access_browsertest.cc", ] diff --git a/patch/patches/storage_incognito_2289.patch b/patch/patches/storage_incognito_2289.patch index 6d50c5583..04cb201e5 100644 --- a/patch/patches/storage_incognito_2289.patch +++ b/patch/patches/storage_incognito_2289.patch @@ -43,10 +43,10 @@ index 0d95af0ef882..463709a9152f 100644 std::make_unique(nullptr); } else { diff --git content/browser/renderer_host/render_process_host_impl.cc content/browser/renderer_host/render_process_host_impl.cc -index 4ae43e97654a..b61fddeaa2c5 100644 +index 67ec1115d928..02cf9cb0e482 100644 --- content/browser/renderer_host/render_process_host_impl.cc +++ content/browser/renderer_host/render_process_host_impl.cc -@@ -2200,6 +2200,9 @@ void RenderProcessHostImpl::RegisterMojoInterfaces() { +@@ -2202,6 +2202,9 @@ void RenderProcessHostImpl::RegisterMojoInterfaces() { plugin_registry_.reset( new PluginRegistryImpl(GetBrowserContext()->GetResourceContext())); } diff --git a/patch/patches/views_widget_180_1481_1565_1677_1749.patch b/patch/patches/views_widget_180_1481_1565_1677_1749.patch index 5371f5bb4..e65cf44ab 100644 --- a/patch/patches/views_widget_180_1481_1565_1677_1749.patch +++ b/patch/patches/views_widget_180_1481_1565_1677_1749.patch @@ -411,7 +411,7 @@ index 5bcb8d8b9bae..020fa85573aa 100644 if (native_widget_delegate->IsDialogBox()) { *style |= DS_MODALFRAME; diff --git ui/views/win/hwnd_message_handler.cc ui/views/win/hwnd_message_handler.cc -index de88c769b5be..1b642132eb2f 100644 +index abde4d03cb3b..dbe770d119c9 100644 --- ui/views/win/hwnd_message_handler.cc +++ ui/views/win/hwnd_message_handler.cc @@ -2903,10 +2903,13 @@ LRESULT HWNDMessageHandler::HandleMouseEventInternal(UINT message, diff --git a/patch/patches/webkit_plugin_info_2015.patch b/patch/patches/webkit_plugin_info_2015.patch index 1607152d5..0b352c3e3 100644 --- a/patch/patches/webkit_plugin_info_2015.patch +++ b/patch/patches/webkit_plugin_info_2015.patch @@ -26,7 +26,7 @@ index cd2e8603c391..a0eb460fcae1 100644 static void InitializeCommon(Platform* platform, std::unique_ptr main_thread); diff --git third_party/blink/renderer/core/dom/dom_implementation.cc third_party/blink/renderer/core/dom/dom_implementation.cc -index 3de30fbbe096..a7cab9da38f2 100644 +index 5e2b2fc592bd..e49fff54b36d 100644 --- third_party/blink/renderer/core/dom/dom_implementation.cc +++ third_party/blink/renderer/core/dom/dom_implementation.cc @@ -244,10 +244,11 @@ Document* DOMImplementation::createDocument(const String& type, diff --git a/patch/patches/win_rt_2274.patch b/patch/patches/win_rt_2274.patch index 9ecbd341d..92cac3f0e 100644 --- a/patch/patches/win_rt_2274.patch +++ b/patch/patches/win_rt_2274.patch @@ -1,8 +1,8 @@ diff --git services/service_manager/sandbox/win/sandbox_win.cc services/service_manager/sandbox/win/sandbox_win.cc -index b5e74f458898..c0f00b9745df 100644 +index e57439cdb4d8..97afc5be9928 100644 --- services/service_manager/sandbox/win/sandbox_win.cc +++ services/service_manager/sandbox/win/sandbox_win.cc -@@ -931,8 +931,11 @@ sandbox::ResultCode SandboxWin::StartSandboxedProcess( +@@ -933,8 +933,11 @@ sandbox::ResultCode SandboxWin::StartSandboxedProcess( } // TODO(wfh): Relax strict handle checks for network process until root cause // for this crash can be resolved. See https://crbug.com/939590.