From 0e44127ee508a4d603e7d24ec476ffda0fec926d Mon Sep 17 00:00:00 2001 From: Marshall Greenblatt Date: Thu, 1 Feb 2018 15:55:40 -0500 Subject: [PATCH] Update to Chromium version 64.0.3282.119 --- CHROMIUM_BUILD_COMPATIBILITY.txt | 2 +- patch/patches/content_1129_2015.patch | 6 ++-- patch/patches/extensions_1947.patch | 29 ++++++++++++++----- patch/patches/prefs_content_1161.patch | 2 +- patch/patches/rwh_background_color_1984.patch | 2 +- patch/patches/storage_partition_1973.patch | 6 ++-- 6 files changed, 31 insertions(+), 16 deletions(-) diff --git a/CHROMIUM_BUILD_COMPATIBILITY.txt b/CHROMIUM_BUILD_COMPATIBILITY.txt index 4a0eb51e7..387d0a6bb 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/64.0.3282.71', + 'chromium_checkout': 'refs/tags/64.0.3282.119', } diff --git a/patch/patches/content_1129_2015.patch b/patch/patches/content_1129_2015.patch index 00d0756bf..5ce1d43b3 100644 --- a/patch/patches/content_1129_2015.patch +++ b/patch/patches/content_1129_2015.patch @@ -501,10 +501,10 @@ index 10b32b1254c6..6ba3dfbe9d15 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 3cd99e14d1d5..96e8d51625d7 100644 +index edda27d2cfb0..9ecc52e8f9e2 100644 --- content/renderer/renderer_blink_platform_impl.cc +++ content/renderer/renderer_blink_platform_impl.cc -@@ -846,6 +846,7 @@ RendererBlinkPlatformImpl::CreateMIDIAccessor( +@@ -845,6 +845,7 @@ RendererBlinkPlatformImpl::CreateMIDIAccessor( void RendererBlinkPlatformImpl::GetPluginList( bool refresh, @@ -512,7 +512,7 @@ index 3cd99e14d1d5..96e8d51625d7 100644 const blink::WebSecurityOrigin& mainFrameOrigin, blink::WebPluginListBuilder* builder) { #if BUILDFLAG(ENABLE_PLUGINS) -@@ -853,7 +854,8 @@ void RendererBlinkPlatformImpl::GetPluginList( +@@ -852,7 +853,8 @@ void RendererBlinkPlatformImpl::GetPluginList( if (!plugin_refresh_allowed_) refresh = false; RenderThread::Get()->Send( diff --git a/patch/patches/extensions_1947.patch b/patch/patches/extensions_1947.patch index 71cabec9f..c2578057a 100644 --- a/patch/patches/extensions_1947.patch +++ b/patch/patches/extensions_1947.patch @@ -1,8 +1,8 @@ diff --git content/browser/frame_host/render_frame_host_manager.cc content/browser/frame_host/render_frame_host_manager.cc -index 92065af1b9d4..2036db554e67 100644 +index 1971727c0a8f..2babb3aca3d0 100644 --- content/browser/frame_host/render_frame_host_manager.cc +++ content/browser/frame_host/render_frame_host_manager.cc -@@ -1083,10 +1083,11 @@ bool RenderFrameHostManager::ShouldSwapBrowsingInstancesForNavigation( +@@ -1111,10 +1111,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. @@ -18,7 +18,7 @@ index 92065af1b9d4..2036db554e67 100644 return true; } -@@ -1225,7 +1226,8 @@ RenderFrameHostManager::GetSiteInstanceForNavigation( +@@ -1253,7 +1254,8 @@ RenderFrameHostManager::GetSiteInstanceForNavigation( // Double-check that the new SiteInstance is associated with the right // BrowserContext. @@ -28,11 +28,26 @@ index 92065af1b9d4..2036db554e67 100644 // If |new_instance| is a new SiteInstance for a subframe with an isolated // origin, set its process reuse policy so that such subframes are +@@ -1286,10 +1288,10 @@ void RenderFrameHostManager::InitializeRenderFrameIfNecessary( + if (render_frame_host != render_frame_host_.get()) + return; + +- EnsureRenderFrameHostVisibilityConsistent(); +- +- // TODO: uncomment this when the method is shared. Not adding the call now +- // to make merge to 63 easier. ++ EnsureRenderFrameHostVisibilityConsistent(); ++ ++ // TODO: uncomment this when the method is shared. Not adding the call now ++ // to make merge to 63 easier. + // EnsureRenderFrameHostPageFocusConsistent(); + + // TODO(nasko): This is a very ugly hack. The Chrome extensions process diff --git content/public/browser/content_browser_client.h content/public/browser/content_browser_client.h -index 3841f3c1c010..f2a7eb747a2a 100644 +index 6b6614b9b04a..881907067740 100644 --- content/public/browser/content_browser_client.h +++ content/public/browser/content_browser_client.h -@@ -350,6 +350,13 @@ class CONTENT_EXPORT ContentBrowserClient { +@@ -346,6 +346,13 @@ class CONTENT_EXPORT ContentBrowserClient { const GURL& current_url, const GURL& new_url); @@ -191,10 +206,10 @@ index 69434c704f2f..f31b65fcd192 100644 // once each time the extensions system is loaded per browser_context. The // implementation may wish to use the BrowserContext to record the current diff --git extensions/browser/process_manager.cc extensions/browser/process_manager.cc -index 5a06db3d4495..b960853f02b2 100644 +index 20ceb782efe3..734972c71897 100644 --- extensions/browser/process_manager.cc +++ extensions/browser/process_manager.cc -@@ -349,9 +349,16 @@ bool ProcessManager::CreateBackgroundHost(const Extension* extension, +@@ -350,9 +350,16 @@ bool ProcessManager::CreateBackgroundHost(const Extension* extension, return true; // TODO(kalman): return false here? It might break things... DVLOG(1) << "CreateBackgroundHost " << extension->id(); diff --git a/patch/patches/prefs_content_1161.patch b/patch/patches/prefs_content_1161.patch index a54ef544e..b3e278130 100644 --- a/patch/patches/prefs_content_1161.patch +++ b/patch/patches/prefs_content_1161.patch @@ -35,7 +35,7 @@ index 361505babff0..341873d000bc 100644 bool record_whole_document; SavePreviousDocumentResources save_previous_document_resources; diff --git content/renderer/render_view_impl.cc content/renderer/render_view_impl.cc -index 4eea632e028b..d72c931bc68a 100644 +index f86a3361d531..1513c46e1b1d 100644 --- content/renderer/render_view_impl.cc +++ content/renderer/render_view_impl.cc @@ -1250,6 +1250,8 @@ void RenderViewImpl::ApplyWebPreferencesInternal( diff --git a/patch/patches/rwh_background_color_1984.patch b/patch/patches/rwh_background_color_1984.patch index a6be47ce4..89b0a1975 100644 --- a/patch/patches/rwh_background_color_1984.patch +++ b/patch/patches/rwh_background_color_1984.patch @@ -1,5 +1,5 @@ diff --git content/browser/renderer_host/render_widget_host_view_aura.cc content/browser/renderer_host/render_widget_host_view_aura.cc -index 46a5b64a44b3..9ce3e48cf576 100644 +index 2662e67f7eef..c4dbe77e9163 100644 --- content/browser/renderer_host/render_widget_host_view_aura.cc +++ content/browser/renderer_host/render_widget_host_view_aura.cc @@ -435,13 +435,6 @@ RenderWidgetHostViewAura::RenderWidgetHostViewAura( diff --git a/patch/patches/storage_partition_1973.patch b/patch/patches/storage_partition_1973.patch index c52b9b7df..f02919f49 100644 --- a/patch/patches/storage_partition_1973.patch +++ b/patch/patches/storage_partition_1973.patch @@ -111,7 +111,7 @@ index d2478ae31473..5fd30c1cd72c 100644 BrowserThread::PostTask(BrowserThread::IO, FROM_HERE, diff --git content/browser/download/download_manager_impl.cc content/browser/download/download_manager_impl.cc -index 0992aad5fe6c..788d432c48d9 100644 +index 360d672ee139..309c955bc1ca 100644 --- content/browser/download/download_manager_impl.cc +++ content/browser/download/download_manager_impl.cc @@ -83,9 +83,9 @@ WebContents* GetWebContents(int render_process_id, @@ -137,7 +137,7 @@ index 0992aad5fe6c..788d432c48d9 100644 } bool CanRequestURLFromRenderer(int render_process_id, GURL url) { -@@ -987,16 +986,17 @@ void DownloadManagerImpl::BeginDownloadInternal( +@@ -993,16 +992,17 @@ void DownloadManagerImpl::BeginDownloadInternal( if (base::FeatureList::IsEnabled(features::kNetworkService)) { std::unique_ptr request = CreateResourceRequest( params.get()); @@ -209,7 +209,7 @@ index 8816724941ff..6b9a26b7c615 100644 partition->GetPaymentAppContext(); diff --git content/browser/renderer_host/render_process_host_impl.cc content/browser/renderer_host/render_process_host_impl.cc -index a61b8ab0886e..5be550085df1 100644 +index 28a84469516e..77de149cc044 100644 --- content/browser/renderer_host/render_process_host_impl.cc +++ content/browser/renderer_host/render_process_host_impl.cc @@ -500,9 +500,8 @@ class SpareRenderProcessHostManager : public RenderProcessHostObserver {