From 73f7604770c42a78ffc89c6ece284a1d64f9c074 Mon Sep 17 00:00:00 2001 From: Marshall Greenblatt Date: Wed, 13 Feb 2019 11:55:15 -0500 Subject: [PATCH] Update to Chromium version 73.0.3683.27 --- CHROMIUM_BUILD_COMPATIBILITY.txt | 2 +- patch/patches/browser_plugin_guest_1565.patch | 6 +++--- patch/patches/chrome_browser.patch | 4 ++-- patch/patches/chrome_browser_profiles.patch | 2 +- patch/patches/content_2015.patch | 12 ++++++------ patch/patches/extensions_1947.patch | 8 ++++---- patch/patches/prefs_content_1161.patch | 6 +++--- patch/patches/storage_partition_1973.patch | 2 +- patch/patches/webkit_plugin_info_2015.patch | 4 ++-- patch/patches/webkit_pointer_event_781966.patch | 2 +- 10 files changed, 24 insertions(+), 24 deletions(-) diff --git a/CHROMIUM_BUILD_COMPATIBILITY.txt b/CHROMIUM_BUILD_COMPATIBILITY.txt index 9fd04ea28..2b01f7c52 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/73.0.3683.10' + 'chromium_checkout': 'refs/tags/73.0.3683.27' } diff --git a/patch/patches/browser_plugin_guest_1565.patch b/patch/patches/browser_plugin_guest_1565.patch index 15e1ef848..42c626b18 100644 --- a/patch/patches/browser_plugin_guest_1565.patch +++ b/patch/patches/browser_plugin_guest_1565.patch @@ -221,10 +221,10 @@ index c0c553023138..39b8fe0bd57c 100644 RenderWidgetHost* render_widget_host) override; void SetPageTitle(const base::string16& title) override; diff --git content/browser/web_contents/web_contents_view_mac.mm content/browser/web_contents/web_contents_view_mac.mm -index d4f6a36dce63..ba6382ee43ea 100644 +index 7f4308b56a14..d17b8b8ef44d 100644 --- content/browser/web_contents/web_contents_view_mac.mm +++ content/browser/web_contents/web_contents_view_mac.mm -@@ -313,7 +313,8 @@ void WebContentsViewMac::CreateView( +@@ -312,7 +312,8 @@ void WebContentsViewMac::CreateView( } RenderWidgetHostViewBase* WebContentsViewMac::CreateViewForWidget( @@ -234,7 +234,7 @@ index d4f6a36dce63..ba6382ee43ea 100644 if (render_widget_host->GetView()) { // During testing, the view will already be set up in most cases to the // test view, so we don't want to clobber it with a real one. To verify that -@@ -325,6 +326,7 @@ RenderWidgetHostViewBase* WebContentsViewMac::CreateViewForWidget( +@@ -324,6 +325,7 @@ RenderWidgetHostViewBase* WebContentsViewMac::CreateViewForWidget( render_widget_host->GetView()); } diff --git a/patch/patches/chrome_browser.patch b/patch/patches/chrome_browser.patch index 1279e06a2..e2bb27be5 100644 --- a/patch/patches/chrome_browser.patch +++ b/patch/patches/chrome_browser.patch @@ -1,5 +1,5 @@ diff --git chrome/browser/BUILD.gn chrome/browser/BUILD.gn -index 6ebafc0acd44..96644b7b809c 100644 +index 1b12e3b97384..8e214412a53d 100644 --- chrome/browser/BUILD.gn +++ chrome/browser/BUILD.gn @@ -8,6 +8,7 @@ import("//build/config/features.gni") @@ -29,7 +29,7 @@ index 6ebafc0acd44..96644b7b809c 100644 if (is_android) { sources += [ "after_startup_task_utils_android.cc", -@@ -3713,7 +3719,7 @@ jumbo_split_static_library("browser") { +@@ -3716,7 +3722,7 @@ jumbo_split_static_library("browser") { ] } diff --git a/patch/patches/chrome_browser_profiles.patch b/patch/patches/chrome_browser_profiles.patch index 711f8a02a..169d6912c 100644 --- a/patch/patches/chrome_browser_profiles.patch +++ b/patch/patches/chrome_browser_profiles.patch @@ -71,7 +71,7 @@ index e8e76ce5b954..1dd338dd0142 100644 content::BrowserContext* GetBrowserContextRedirectedInIncognito( content::BrowserContext* context); diff --git chrome/browser/profiles/profile_manager.cc chrome/browser/profiles/profile_manager.cc -index 16c500023e3f..e0bc6609c6ae 100644 +index 7c6dbb5e026f..24dfc5caf7c2 100644 --- chrome/browser/profiles/profile_manager.cc +++ chrome/browser/profiles/profile_manager.cc @@ -386,7 +386,7 @@ ProfileManager::ProfileManager(const base::FilePath& user_data_dir) diff --git a/patch/patches/content_2015.patch b/patch/patches/content_2015.patch index eac09074b..8d81800a9 100644 --- a/patch/patches/content_2015.patch +++ b/patch/patches/content_2015.patch @@ -81,7 +81,7 @@ index 244992176f0f..a238f052d468 100644 "WillFailRequest state should come before WillProcessResponse"); return render_frame_host_; diff --git content/browser/frame_host/render_frame_host_impl.cc content/browser/frame_host/render_frame_host_impl.cc -index a6c9e15b29af..6fa7cbe3de6b 100644 +index b4a3b637fa67..bc7b8a4a39c9 100644 --- content/browser/frame_host/render_frame_host_impl.cc +++ content/browser/frame_host/render_frame_host_impl.cc @@ -2153,6 +2153,7 @@ void RenderFrameHostImpl::OnDidFailProvisionalLoadWithError( @@ -92,7 +92,7 @@ index a6c9e15b29af..6fa7cbe3de6b 100644 } frame_tree_node_->navigator()->DidFailProvisionalLoadWithError(this, params); -@@ -4834,9 +4835,9 @@ void RenderFrameHostImpl::CommitNavigation( +@@ -4846,9 +4847,9 @@ void RenderFrameHostImpl::CommitNavigation( DCHECK(base::FeatureList::IsEnabled(network::features::kNetworkService) || base::FeatureList::IsEnabled( blink::features::kServiceWorkerServicification)); @@ -376,10 +376,10 @@ index 44df5d5461c7..b3a7d92a547e 100644 base::Bind(&RenderThreadImpl::OnRendererInterfaceRequest, base::Unretained(this))); diff --git content/renderer/renderer_blink_platform_impl.cc content/renderer/renderer_blink_platform_impl.cc -index 704ee01d0a30..6ad832e8f492 100644 +index 4f7bbf765f92..9d33375d66b5 100644 --- content/renderer/renderer_blink_platform_impl.cc +++ content/renderer/renderer_blink_platform_impl.cc -@@ -1051,6 +1051,14 @@ void RendererBlinkPlatformImpl::SetMemoryPressureNotificationsSuppressed( +@@ -1061,6 +1061,14 @@ void RendererBlinkPlatformImpl::SetMemoryPressureNotificationsSuppressed( base::MemoryPressureListener::SetNotificationsSuppressed(suppressed); } @@ -395,10 +395,10 @@ index 704ee01d0a30..6ad832e8f492 100644 if (!web_database_host_) { web_database_host_ = blink::mojom::ThreadSafeWebDatabaseHostPtr::Create( diff --git content/renderer/renderer_blink_platform_impl.h content/renderer/renderer_blink_platform_impl.h -index 0052cff07aec..e1920c231d9c 100644 +index a65c2138b708..1277b75e3f0b 100644 --- content/renderer/renderer_blink_platform_impl.h +++ content/renderer/renderer_blink_platform_impl.h -@@ -229,6 +229,9 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl { +@@ -231,6 +231,9 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl { void RequestPurgeMemory() override; void SetMemoryPressureNotificationsSuppressed(bool suppressed) override; diff --git a/patch/patches/extensions_1947.patch b/patch/patches/extensions_1947.patch index 03e1d020d..83f43cc34 100644 --- a/patch/patches/extensions_1947.patch +++ b/patch/patches/extensions_1947.patch @@ -27,10 +27,10 @@ index 9e81f0a33ede..b796e79ae7ef 100644 auto* browser_context = web_contents->GetBrowserContext(); diff --git content/browser/frame_host/render_frame_host_manager.cc content/browser/frame_host/render_frame_host_manager.cc -index 53586512b68f..3a7ba906571a 100644 +index dce34d553156..e42e6bc5e1af 100644 --- content/browser/frame_host/render_frame_host_manager.cc +++ content/browser/frame_host/render_frame_host_manager.cc -@@ -945,10 +945,11 @@ bool RenderFrameHostManager::ShouldSwapBrowsingInstancesForNavigation( +@@ -955,10 +955,11 @@ bool RenderFrameHostManager::ShouldSwapBrowsingInstancesForNavigation( // TODO(alexmos): This check should've been enforced earlier in the // navigation, in chrome::Navigate(). Verify this, and then convert this to // a CHECK and remove the fallback. @@ -46,7 +46,7 @@ index 53586512b68f..3a7ba906571a 100644 return true; } -@@ -1087,7 +1088,8 @@ RenderFrameHostManager::GetSiteInstanceForNavigation( +@@ -1097,7 +1098,8 @@ RenderFrameHostManager::GetSiteInstanceForNavigation( // Double-check that the new SiteInstance is associated with the right // BrowserContext. @@ -57,7 +57,7 @@ index 53586512b68f..3a7ba906571a 100644 // If |new_instance| is a new SiteInstance for a subframe that requires a // dedicated process, set its process reuse policy so that such subframes are diff --git content/public/browser/content_browser_client.h content/public/browser/content_browser_client.h -index 694796bf8dbb..86c9088c1721 100644 +index eaa7d8b25141..7cdf8e39bc82 100644 --- content/public/browser/content_browser_client.h +++ content/public/browser/content_browser_client.h @@ -452,6 +452,13 @@ class CONTENT_EXPORT ContentBrowserClient { diff --git a/patch/patches/prefs_content_1161.patch b/patch/patches/prefs_content_1161.patch index e5a48040d..485bdb8d3 100644 --- a/patch/patches/prefs_content_1161.patch +++ b/patch/patches/prefs_content_1161.patch @@ -1,5 +1,5 @@ diff --git content/public/common/common_param_traits_macros.h content/public/common/common_param_traits_macros.h -index 242b0628f54e..0538943b4f20 100644 +index c97cf2650a99..54b13c9a587b 100644 --- content/public/common/common_param_traits_macros.h +++ content/public/common/common_param_traits_macros.h @@ -189,6 +189,7 @@ IPC_STRUCT_TRAITS_BEGIN(content::WebPreferences) @@ -23,7 +23,7 @@ index 8ce9ab728194..22305856b974 100644 record_whole_document(false), cookie_enabled(true), diff --git content/public/common/web_preferences.h content/public/common/web_preferences.h -index 32cc528cd938..91bc866edddb 100644 +index 52edd1acaa28..a508264986d8 100644 --- content/public/common/web_preferences.h +++ content/public/common/web_preferences.h @@ -192,6 +192,7 @@ struct CONTENT_EXPORT WebPreferences { @@ -35,7 +35,7 @@ index 32cc528cd938..91bc866edddb 100644 bool record_whole_document; diff --git content/renderer/render_view_impl.cc content/renderer/render_view_impl.cc -index 77b93bd04c8b..512bf7ab5922 100644 +index 676b344fe809..e816955e4c60 100644 --- content/renderer/render_view_impl.cc +++ content/renderer/render_view_impl.cc @@ -1013,6 +1013,8 @@ void RenderView::ApplyWebPreferences(const WebPreferences& prefs, diff --git a/patch/patches/storage_partition_1973.patch b/patch/patches/storage_partition_1973.patch index 8f2d0c159..52b29ab67 100644 --- a/patch/patches/storage_partition_1973.patch +++ b/patch/patches/storage_partition_1973.patch @@ -171,7 +171,7 @@ index ec9ab86d0ca6..0fe5219f1e84 100644 base::WeakPtrFactory weak_factory_; diff --git content/browser/download/download_manager_impl.cc content/browser/download/download_manager_impl.cc -index 941eb49f0283..c693adf52068 100644 +index 2d45e9e41f49..fabc2af20806 100644 --- content/browser/download/download_manager_impl.cc +++ content/browser/download/download_manager_impl.cc @@ -99,9 +99,9 @@ void DeleteDownloadedFileOnUIThread(const base::FilePath& file_path) { diff --git a/patch/patches/webkit_plugin_info_2015.patch b/patch/patches/webkit_plugin_info_2015.patch index 25c36470c..026ab4ed7 100644 --- a/patch/patches/webkit_plugin_info_2015.patch +++ b/patch/patches/webkit_plugin_info_2015.patch @@ -80,10 +80,10 @@ index 92e9cb865204..e3d51ec6263e 100644 + GetPlugins(bool refresh, bool is_main_frame, url.mojom.Origin main_frame_origin) => (array plugins); +}; diff --git third_party/blink/public/platform/platform.h third_party/blink/public/platform/platform.h -index bfc4a95febcf..1d06dbbb09b0 100644 +index 3b36d5710b08..d44f62901985 100644 --- third_party/blink/public/platform/platform.h +++ third_party/blink/public/platform/platform.h -@@ -754,6 +754,11 @@ class BLINK_PLATFORM_EXPORT Platform { +@@ -759,6 +759,11 @@ class BLINK_PLATFORM_EXPORT Platform { // runs during Chromium's build step). virtual bool IsTakingV8ContextSnapshot() { return false; } diff --git a/patch/patches/webkit_pointer_event_781966.patch b/patch/patches/webkit_pointer_event_781966.patch index e64b918aa..80b2483d5 100644 --- a/patch/patches/webkit_pointer_event_781966.patch +++ b/patch/patches/webkit_pointer_event_781966.patch @@ -1,5 +1,5 @@ diff --git third_party/blink/renderer/core/input/pointer_event_manager.cc third_party/blink/renderer/core/input/pointer_event_manager.cc -index 49c6ec343bd6..e8a00e915a70 100644 +index 990c1a953dc8..534fb3fef8d1 100644 --- third_party/blink/renderer/core/input/pointer_event_manager.cc +++ third_party/blink/renderer/core/input/pointer_event_manager.cc @@ -282,7 +282,7 @@ void PointerEventManager::HandlePointerInterruption(