From f0a1c440eec1a9a2a5cdeb43be9d7f606a4341b0 Mon Sep 17 00:00:00 2001 From: Marshall Greenblatt Date: Mon, 30 Sep 2019 13:18:22 +0300 Subject: [PATCH] Update to Chromium version 77.0.3865.90 --- CHROMIUM_BUILD_COMPATIBILITY.txt | 2 +- patch/patches/chrome_browser_product_override.patch | 6 +++--- patch/patches/content_2015.patch | 2 +- patch/patches/gn_config.patch | 4 ++-- patch/patches/linux_gtk_2014.patch | 6 +++--- patch/patches/webkit_plugin_info_2015.patch | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/CHROMIUM_BUILD_COMPATIBILITY.txt b/CHROMIUM_BUILD_COMPATIBILITY.txt index d275e9e53..31306cab8 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/77.0.3865.56' + 'chromium_checkout': 'refs/tags/77.0.3865.90' } diff --git a/patch/patches/chrome_browser_product_override.patch b/patch/patches/chrome_browser_product_override.patch index 5d1286548..4f97057c5 100644 --- a/patch/patches/chrome_browser_product_override.patch +++ b/patch/patches/chrome_browser_product_override.patch @@ -1,8 +1,8 @@ diff --git chrome/browser/chrome_content_browser_client.cc chrome/browser/chrome_content_browser_client.cc -index 0b29bc11f07c..9c0ffba4dc20 100644 +index 84354ff218e8..c5ac79c4d3aa 100644 --- chrome/browser/chrome_content_browser_client.cc +++ chrome/browser/chrome_content_browser_client.cc -@@ -1067,10 +1067,6 @@ void LaunchURL( +@@ -1068,10 +1068,6 @@ void LaunchURL( } } @@ -13,7 +13,7 @@ index 0b29bc11f07c..9c0ffba4dc20 100644 void MaybeAppendSecureOriginsAllowlistSwitch(base::CommandLine* cmdline) { // |allowlist| combines pref/policy + cmdline switch in the browser process. // For renderer and utility (e.g. NetworkService) processes the switch is the -@@ -1088,6 +1084,14 @@ void MaybeAppendSecureOriginsAllowlistSwitch(base::CommandLine* cmdline) { +@@ -1089,6 +1085,14 @@ void MaybeAppendSecureOriginsAllowlistSwitch(base::CommandLine* cmdline) { } // namespace diff --git a/patch/patches/content_2015.patch b/patch/patches/content_2015.patch index 4a3a2d726..fd94979b7 100644 --- a/patch/patches/content_2015.patch +++ b/patch/patches/content_2015.patch @@ -373,7 +373,7 @@ index 0e2e86e6a2af..b44e90f69263 100644 virtual void FocusedElementChanged(const blink::WebElement& element) {} diff --git content/renderer/render_frame_impl.cc content/renderer/render_frame_impl.cc -index 01b1d995c656..31bfea00ca60 100644 +index f5f11bd31f7a..031ac3d689db 100644 --- content/renderer/render_frame_impl.cc +++ content/renderer/render_frame_impl.cc @@ -4118,7 +4118,8 @@ blink::WebPlugin* RenderFrameImpl::CreatePlugin( diff --git a/patch/patches/gn_config.patch b/patch/patches/gn_config.patch index db49a8bae..993e6ed65 100644 --- a/patch/patches/gn_config.patch +++ b/patch/patches/gn_config.patch @@ -56,10 +56,10 @@ index 982fbe8d3f0d..e757be4688f1 100644 + "studio path") } diff --git build/toolchain/win/setup_toolchain.py build/toolchain/win/setup_toolchain.py -index ef8aeda56458..5b7f057311b9 100644 +index 9ee69df7d210..00ad4b3be81a 100644 --- build/toolchain/win/setup_toolchain.py +++ build/toolchain/win/setup_toolchain.py -@@ -136,22 +136,25 @@ def _LoadToolchainEnv(cpu, sdk_dir, target_store): +@@ -142,22 +142,25 @@ def _LoadToolchainEnv(cpu, sdk_dir, target_store): # variable. if 'VSINSTALLDIR' in os.environ: del os.environ['VSINSTALLDIR'] diff --git a/patch/patches/linux_gtk_2014.patch b/patch/patches/linux_gtk_2014.patch index 551ab9776..666c87a32 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 39a8fc308408..8097a58a5fe1 100644 +index 954efb536692..348043e3a82d 100644 --- chrome/test/BUILD.gn +++ chrome/test/BUILD.gn -@@ -4461,7 +4461,7 @@ test("unit_tests") { +@@ -4462,7 +4462,7 @@ test("unit_tests") { if (use_gio) { configs += [ "//build/linux:gio_config" ] } @@ -51,7 +51,7 @@ index 39a8fc308408..8097a58a5fe1 100644 deps += [ "//chrome/browser/ui/libgtkui" ] } -@@ -5475,7 +5475,7 @@ if (!is_android) { +@@ -5476,7 +5476,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/webkit_plugin_info_2015.patch b/patch/patches/webkit_plugin_info_2015.patch index 477ba7c17..569cbbc4e 100644 --- a/patch/patches/webkit_plugin_info_2015.patch +++ b/patch/patches/webkit_plugin_info_2015.patch @@ -44,7 +44,7 @@ index 80a9ec9bc75b..13cbb056cdfa 100644 .Top() .GetSecurityContext() diff --git third_party/blink/renderer/core/frame/local_frame.cc third_party/blink/renderer/core/frame/local_frame.cc -index 1f5407c50edd..648753d70ec7 100644 +index bcc0869cc2f9..50cb19a2c16f 100644 --- third_party/blink/renderer/core/frame/local_frame.cc +++ third_party/blink/renderer/core/frame/local_frame.cc @@ -1188,7 +1188,7 @@ WebContentSettingsClient* LocalFrame::GetContentSettingsClient() {