From c3a31f5f3e0124749764c2b23de0230de870956f Mon Sep 17 00:00:00 2001 From: Marshall Greenblatt Date: Thu, 31 May 2018 20:15:16 -0400 Subject: [PATCH] Update to Chromium version 67.0.3396.62 --- CHROMIUM_BUILD_COMPATIBILITY.txt | 2 +- patch/patches/browser_compositor_mac.patch | 4 ++-- patch/patches/browser_plugin_guest_1565.patch | 2 +- patch/patches/chrome_browser.patch | 2 +- patch/patches/chrome_browser_content_settings.patch | 10 +++++----- patch/patches/component_build_1617.patch | 2 +- patch/patches/content_2015.patch | 10 +++++----- patch/patches/prefs_content_1161.patch | 6 +++--- patch/patches/rwh_background_color_1984.patch | 2 +- patch/patches/storage_partition_1973.patch | 2 +- .../patches/views_widget_180_1481_1565_1677_1749.patch | 10 +++++----- patch/patches/web_contents_1257_1565.patch | 4 ++-- patch/patches/webkit_popups.patch | 2 +- 13 files changed, 29 insertions(+), 29 deletions(-) diff --git a/CHROMIUM_BUILD_COMPATIBILITY.txt b/CHROMIUM_BUILD_COMPATIBILITY.txt index f27c2abd0..b4a1f457e 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/67.0.3396.30', + 'chromium_checkout': 'refs/tags/67.0.3396.62', } diff --git a/patch/patches/browser_compositor_mac.patch b/patch/patches/browser_compositor_mac.patch index 7b5ce7e6e..accc86d7f 100644 --- a/patch/patches/browser_compositor_mac.patch +++ b/patch/patches/browser_compositor_mac.patch @@ -1,5 +1,5 @@ diff --git content/browser/renderer_host/browser_compositor_view_mac.h content/browser/renderer_host/browser_compositor_view_mac.h -index 3c627056a718..1b33fcf47a13 100644 +index e7d40839956f..bda09e167c87 100644 --- content/browser/renderer_host/browser_compositor_view_mac.h +++ content/browser/renderer_host/browser_compositor_view_mac.h @@ -55,11 +55,13 @@ class CONTENT_EXPORT BrowserCompositorMac : public DelegatedFrameHostClient { @@ -17,7 +17,7 @@ index 3c627056a718..1b33fcf47a13 100644 void DidCreateNewRendererCompositorFrameSink( viz::mojom::CompositorFrameSinkClient* renderer_compositor_frame_sink); diff --git content/browser/renderer_host/browser_compositor_view_mac.mm content/browser/renderer_host/browser_compositor_view_mac.mm -index 625eb2228a8d..0ad0ca498f06 100644 +index 3d5a2193bd51..9bdd51d2007d 100644 --- content/browser/renderer_host/browser_compositor_view_mac.mm +++ content/browser/renderer_host/browser_compositor_view_mac.mm @@ -208,6 +208,12 @@ BrowserCompositorMac::~BrowserCompositorMac() { diff --git a/patch/patches/browser_plugin_guest_1565.patch b/patch/patches/browser_plugin_guest_1565.patch index 770d1bd5d..0ad7e1f03 100644 --- a/patch/patches/browser_plugin_guest_1565.patch +++ b/patch/patches/browser_plugin_guest_1565.patch @@ -37,7 +37,7 @@ index 15994d5dada4..e19eca0c4369 100644 attached_ = true; diff --git content/browser/frame_host/interstitial_page_impl.cc content/browser/frame_host/interstitial_page_impl.cc -index af9c604d5785..81d3071b0f3d 100644 +index 94e29b878e17..fb546b77d2b7 100644 --- content/browser/frame_host/interstitial_page_impl.cc +++ content/browser/frame_host/interstitial_page_impl.cc @@ -618,7 +618,7 @@ WebContentsView* InterstitialPageImpl::CreateWebContentsView() { diff --git a/patch/patches/chrome_browser.patch b/patch/patches/chrome_browser.patch index 7fd69f7db..fca8e6791 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 8949cea6d2bc..af20831d4c24 100644 +index e73bbc01264c..7cf4471e4b24 100644 --- chrome/browser/BUILD.gn +++ chrome/browser/BUILD.gn @@ -8,6 +8,7 @@ import("//build/config/features.gni") diff --git a/patch/patches/chrome_browser_content_settings.patch b/patch/patches/chrome_browser_content_settings.patch index 1ca4ed980..0b007cfda 100644 --- a/patch/patches/chrome_browser_content_settings.patch +++ b/patch/patches/chrome_browser_content_settings.patch @@ -1,5 +1,5 @@ diff --git chrome/browser/content_settings/host_content_settings_map_factory.cc chrome/browser/content_settings/host_content_settings_map_factory.cc -index 07ebea6a6ebf..d60387aa4cdf 100644 +index 607dfe4d4c99..27e55b7f6b2d 100644 --- chrome/browser/content_settings/host_content_settings_map_factory.cc +++ chrome/browser/content_settings/host_content_settings_map_factory.cc @@ -7,6 +7,7 @@ @@ -9,8 +9,8 @@ index 07ebea6a6ebf..d60387aa4cdf 100644 +#include "cef/libcef/features/features.h" #include "chrome/browser/profiles/off_the_record_profile_impl.h" #include "chrome/browser/profiles/profile.h" - #include "chrome/common/chrome_features.h" -@@ -16,6 +17,10 @@ + #include "chrome/browser/search_engines/template_url_service_factory.h" +@@ -17,6 +18,10 @@ #include "content/public/browser/browser_thread.h" #include "extensions/buildflags/buildflags.h" @@ -21,7 +21,7 @@ index 07ebea6a6ebf..d60387aa4cdf 100644 #if BUILDFLAG(ENABLE_EXTENSIONS) #include "chrome/browser/extensions/extension_service.h" #include "extensions/browser/extension_system.h" -@@ -41,8 +46,14 @@ HostContentSettingsMapFactory::HostContentSettingsMapFactory() +@@ -42,8 +47,14 @@ HostContentSettingsMapFactory::HostContentSettingsMapFactory() DependsOn(SupervisedUserSettingsServiceFactory::GetInstance()); #endif #if BUILDFLAG(ENABLE_EXTENSIONS) @@ -36,7 +36,7 @@ index 07ebea6a6ebf..d60387aa4cdf 100644 #endif } -@@ -86,9 +97,15 @@ scoped_refptr +@@ -87,9 +98,15 @@ scoped_refptr /*store_last_modified=*/true)); #if BUILDFLAG(ENABLE_EXTENSIONS) diff --git a/patch/patches/component_build_1617.patch b/patch/patches/component_build_1617.patch index c3ddd52cf..dd25629bd 100644 --- a/patch/patches/component_build_1617.patch +++ b/patch/patches/component_build_1617.patch @@ -13,7 +13,7 @@ index 4393a8fac233..860715e86900 100644 explicit ContentServiceManagerMainDelegate(const ContentMainParams& params); ~ContentServiceManagerMainDelegate() override; diff --git third_party/blink/renderer/controller/BUILD.gn third_party/blink/renderer/controller/BUILD.gn -index 5726fbac54bf..46fd0b2bd568 100644 +index 7f3cf01859a7..74deeb84127f 100644 --- third_party/blink/renderer/controller/BUILD.gn +++ third_party/blink/renderer/controller/BUILD.gn @@ -25,6 +25,7 @@ component("controller") { diff --git a/patch/patches/content_2015.patch b/patch/patches/content_2015.patch index f82c20284..6ed1ccab1 100644 --- a/patch/patches/content_2015.patch +++ b/patch/patches/content_2015.patch @@ -93,7 +93,7 @@ index 0c0c4cbb9efe..4703ce943367 100644 } diff --git content/browser/frame_host/render_frame_host_impl.cc content/browser/frame_host/render_frame_host_impl.cc -index 8a64612e8e34..2b6a1e710222 100644 +index d938013c90b6..5602c2279847 100644 --- content/browser/frame_host/render_frame_host_impl.cc +++ content/browser/frame_host/render_frame_host_impl.cc @@ -1557,6 +1557,7 @@ void RenderFrameHostImpl::OnDidFailProvisionalLoadWithError( @@ -104,7 +104,7 @@ index 8a64612e8e34..2b6a1e710222 100644 } frame_tree_node_->navigator()->DidFailProvisionalLoadWithError(this, params); -@@ -3314,9 +3315,9 @@ void RenderFrameHostImpl::RegisterMojoInterfaces() { +@@ -3326,9 +3327,9 @@ void RenderFrameHostImpl::RegisterMojoInterfaces() { &QuotaDispatcherHost::CreateForFrame, GetProcess(), routing_id_)); if (base::FeatureList::IsEnabled(network::features::kNetworkService)) { @@ -117,7 +117,7 @@ index 8a64612e8e34..2b6a1e710222 100644 // TODO(https://crbug.com/813479): Investigate why we need to explicitly // specify task runner for BrowserThread::IO here. // Bind calls to the BindRegistry should come on to the IO thread by -@@ -3593,9 +3594,9 @@ void RenderFrameHostImpl::CommitNavigation( +@@ -3605,9 +3606,9 @@ void RenderFrameHostImpl::CommitNavigation( // however only do this for cross-document navigations, because the // alternative would be redundant effort. network::mojom::URLLoaderFactoryPtrInfo default_factory_info; @@ -130,7 +130,7 @@ index 8a64612e8e34..2b6a1e710222 100644 if (subresource_loader_params && subresource_loader_params->loader_factory_info.is_valid()) { // If the caller has supplied a default URLLoaderFactory override (for -@@ -4223,8 +4224,8 @@ void RenderFrameHostImpl::CreateNetworkServiceDefaultFactoryAndObserve( +@@ -4235,8 +4236,8 @@ void RenderFrameHostImpl::CreateNetworkServiceDefaultFactoryAndObserve( // Keep DevTools proxy lasy, i.e. closest to the network. RenderFrameDevToolsAgentHost::WillCreateURLLoaderFactory( this, false, &default_factory_request); @@ -141,7 +141,7 @@ index 8a64612e8e34..2b6a1e710222 100644 if (g_create_network_factory_callback_for_test.Get().is_null()) { storage_partition->GetNetworkContext()->CreateURLLoaderFactory( std::move(default_factory_request), GetProcess()->GetID()); -@@ -4475,8 +4476,8 @@ void RenderFrameHostImpl::CreateWebSocket( +@@ -4487,8 +4488,8 @@ void RenderFrameHostImpl::CreateWebSocket( network::mojom::WebSocketRequest request) { if (base::FeatureList::IsEnabled(network::features::kNetworkService)) { auto* context = GetSiteInstance()->GetBrowserContext(); diff --git a/patch/patches/prefs_content_1161.patch b/patch/patches/prefs_content_1161.patch index 4b7ecf9c5..3825f955b 100644 --- a/patch/patches/prefs_content_1161.patch +++ b/patch/patches/prefs_content_1161.patch @@ -11,10 +11,10 @@ index 3b72878d9462..02ed570accd6 100644 IPC_STRUCT_TRAITS_MEMBER(navigate_on_drag_drop) IPC_STRUCT_TRAITS_MEMBER(spatial_navigation_enabled) diff --git content/public/common/web_preferences.cc content/public/common/web_preferences.cc -index 53bc2c0a9711..d070118f34cf 100644 +index dcff5cef776a..53d6a85aec31 100644 --- content/public/common/web_preferences.cc +++ content/public/common/web_preferences.cc -@@ -174,6 +174,7 @@ WebPreferences::WebPreferences() +@@ -176,6 +176,7 @@ WebPreferences::WebPreferences() spatial_navigation_enabled(false), use_solid_color_scrollbars(false), navigate_on_drag_drop(true), @@ -35,7 +35,7 @@ index e4fc39c60fd7..f19fccf47261 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 58cf6da520e2..02ad4c2998bf 100644 +index 7a866ded50f1..25abbdd7a4e8 100644 --- content/renderer/render_view_impl.cc +++ content/renderer/render_view_impl.cc @@ -1209,6 +1209,7 @@ void RenderViewImpl::ApplyWebPreferencesInternal( diff --git a/patch/patches/rwh_background_color_1984.patch b/patch/patches/rwh_background_color_1984.patch index 34181b956..ec9caadb3 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 927e67ee66c8..b939a45dd0ae 100644 +index ebf2d257e64f..db83e9b9af93 100644 --- content/browser/renderer_host/render_widget_host_view_aura.cc +++ content/browser/renderer_host/render_widget_host_view_aura.cc @@ -734,9 +734,11 @@ void RenderWidgetHostViewAura::UpdateBackgroundColorFromRenderer( diff --git a/patch/patches/storage_partition_1973.patch b/patch/patches/storage_partition_1973.patch index 5ea56bf86..3ebe98eb0 100644 --- a/patch/patches/storage_partition_1973.patch +++ b/patch/patches/storage_partition_1973.patch @@ -313,7 +313,7 @@ index 5d4aefd16449..b5f99bc43389 100644 partition->GetPaymentAppContext(); diff --git content/browser/renderer_host/render_process_host_impl.cc content/browser/renderer_host/render_process_host_impl.cc -index 2a5c90e85c7d..25a1b4e006b5 100644 +index dadd00f56a00..5b61ea4e744d 100644 --- content/browser/renderer_host/render_process_host_impl.cc +++ content/browser/renderer_host/render_process_host_impl.cc @@ -738,11 +738,10 @@ class DefaultSubframeProcessHostHolder : public base::SupportsUserData::Data, 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 295fa6e2a..f022ee458 100644 --- a/patch/patches/views_widget_180_1481_1565_1677_1749.patch +++ b/patch/patches/views_widget_180_1481_1565_1677_1749.patch @@ -1,8 +1,8 @@ diff --git content/browser/renderer_host/render_widget_host_view_base.cc content/browser/renderer_host/render_widget_host_view_base.cc -index ca70db586f53..80cc47fdbb50 100644 +index 7655a0fe3f5a..56cb7049e1aa 100644 --- content/browser/renderer_host/render_widget_host_view_base.cc +++ content/browser/renderer_host/render_widget_host_view_base.cc -@@ -371,6 +371,14 @@ float RenderWidgetHostViewBase::GetDeviceScaleFactor() const { +@@ -370,6 +370,14 @@ float RenderWidgetHostViewBase::GetDeviceScaleFactor() const { return screen_info.device_scale_factor; } @@ -18,7 +18,7 @@ index ca70db586f53..80cc47fdbb50 100644 return renderer_frame_number_; } diff --git content/browser/renderer_host/render_widget_host_view_base.h content/browser/renderer_host/render_widget_host_view_base.h -index 5ce1a50d147a..64aced5a0110 100644 +index 8e391207a8a7..f18985045680 100644 --- content/browser/renderer_host/render_widget_host_view_base.h +++ content/browser/renderer_host/render_widget_host_view_base.h @@ -80,6 +80,7 @@ class BrowserAccessibilityManager; @@ -48,7 +48,7 @@ index 5ce1a50d147a..64aced5a0110 100644 TouchSelectionControllerClientManager* GetTouchSelectionControllerClientManager() override; -@@ -423,6 +429,12 @@ class CONTENT_EXPORT RenderWidgetHostViewBase +@@ -428,6 +434,12 @@ class CONTENT_EXPORT RenderWidgetHostViewBase // helps to position the full screen widget on the correct monitor. virtual void InitAsFullscreen(RenderWidgetHostView* reference_host_view) = 0; @@ -61,7 +61,7 @@ index 5ce1a50d147a..64aced5a0110 100644 // Sets the cursor for this view to the one associated with the specified // cursor_type. virtual void UpdateCursor(const WebCursor& cursor) = 0; -@@ -593,6 +605,10 @@ class CONTENT_EXPORT RenderWidgetHostViewBase +@@ -598,6 +610,10 @@ class CONTENT_EXPORT RenderWidgetHostViewBase bool is_currently_scrolling_viewport_; diff --git a/patch/patches/web_contents_1257_1565.patch b/patch/patches/web_contents_1257_1565.patch index 43730c44f..34a19f232 100644 --- a/patch/patches/web_contents_1257_1565.patch +++ b/patch/patches/web_contents_1257_1565.patch @@ -1,5 +1,5 @@ diff --git content/browser/web_contents/web_contents_impl.cc content/browser/web_contents/web_contents_impl.cc -index 7085f4e3e887..77ed1f79afc6 100644 +index 942a35d355ac..293c05cc909d 100644 --- content/browser/web_contents/web_contents_impl.cc +++ content/browser/web_contents/web_contents_impl.cc @@ -1794,21 +1794,30 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) { @@ -70,7 +70,7 @@ index 7085f4e3e887..77ed1f79afc6 100644 } // Save the created window associated with the route so we can show it // later. -@@ -5750,7 +5768,7 @@ InterstitialPageImpl* WebContentsImpl::GetInterstitialForRenderManager() { +@@ -5749,7 +5767,7 @@ InterstitialPageImpl* WebContentsImpl::GetInterstitialForRenderManager() { void WebContentsImpl::CreateRenderWidgetHostViewForRenderManager( RenderViewHost* render_view_host) { RenderWidgetHostViewBase* rwh_view = diff --git a/patch/patches/webkit_popups.patch b/patch/patches/webkit_popups.patch index 82d1c08de..e35c37303 100644 --- a/patch/patches/webkit_popups.patch +++ b/patch/patches/webkit_popups.patch @@ -20,7 +20,7 @@ index cd3bf3baf8c2..3d9a992a29b3 100644 // Call these methods before and after running a nested, modal event loop diff --git third_party/blink/renderer/core/exported/web_view_impl.cc third_party/blink/renderer/core/exported/web_view_impl.cc -index e46c83b1b6bb..7099fe8c2bda 100644 +index 580b48c703ee..190727cd66d1 100644 --- third_party/blink/renderer/core/exported/web_view_impl.cc +++ third_party/blink/renderer/core/exported/web_view_impl.cc @@ -251,8 +251,13 @@ void WebView::SetUseExternalPopupMenus(bool use_external_popup_menus) {