From 8e7c5d6568d4746f315bfbd88c38202237731717 Mon Sep 17 00:00:00 2001 From: Marshall Greenblatt Date: Wed, 18 Apr 2018 20:43:34 -0400 Subject: [PATCH] Update to Chromium version 66.0.3359.117 --- CHROMIUM_BUILD_COMPATIBILITY.txt | 2 +- patch/patches/chrome_plugins.patch | 12 ++++++------ patch/patches/content_2015.patch | 10 +++++----- patch/patches/extensions_1947.patch | 2 +- patch/patches/gn_config.patch | 2 +- patch/patches/rwh_background_color_1984.patch | 4 ++-- .../views_widget_180_1481_1565_1677_1749.patch | 4 ++-- patch/patches/webview_plugin_2020.patch | 2 +- 8 files changed, 19 insertions(+), 19 deletions(-) diff --git a/CHROMIUM_BUILD_COMPATIBILITY.txt b/CHROMIUM_BUILD_COMPATIBILITY.txt index 4f663082b..0af09eee3 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/66.0.3359.81', + 'chromium_checkout': 'refs/tags/66.0.3359.117', } diff --git a/patch/patches/chrome_plugins.patch b/patch/patches/chrome_plugins.patch index 5d27e902d..c40b34e5a 100644 --- a/patch/patches/chrome_plugins.patch +++ b/patch/patches/chrome_plugins.patch @@ -157,10 +157,10 @@ index ab3fd0de9e07..298db88e685f 100644 // If we broke out of the loop, we have found an enabled plugin. bool enabled = i < matching_plugins.size(); diff --git chrome/renderer/chrome_content_renderer_client.cc chrome/renderer/chrome_content_renderer_client.cc -index 700886c6ce89..8a47ec9f91a3 100644 +index 910bf38b9c46..88ec7d4076b8 100644 --- chrome/renderer/chrome_content_renderer_client.cc +++ chrome/renderer/chrome_content_renderer_client.cc -@@ -774,6 +774,7 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin( +@@ -773,6 +773,7 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin( if ((status == chrome::mojom::PluginStatus::kUnauthorized || status == chrome::mojom::PluginStatus::kBlocked) && @@ -168,7 +168,7 @@ index 700886c6ce89..8a47ec9f91a3 100644 observer->IsPluginTemporarilyAllowed(identifier)) { status = chrome::mojom::PluginStatus::kAllowed; } -@@ -961,7 +962,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin( +@@ -960,7 +961,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin( render_frame->GetRemoteAssociatedInterfaces()->GetInterface( &plugin_auth_host); plugin_auth_host->BlockedUnauthorizedPlugin(group_name, identifier); @@ -178,7 +178,7 @@ index 700886c6ce89..8a47ec9f91a3 100644 break; } case chrome::mojom::PluginStatus::kBlocked: { -@@ -970,7 +972,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin( +@@ -969,7 +971,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin( l10n_util::GetStringFUTF16(IDS_PLUGIN_BLOCKED, group_name)); placeholder->AllowLoading(); RenderThread::Get()->RecordAction(UserMetricsAction("Plugin_Blocked")); @@ -188,7 +188,7 @@ index 700886c6ce89..8a47ec9f91a3 100644 break; } case chrome::mojom::PluginStatus::kBlockedByPolicy: { -@@ -980,7 +983,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin( +@@ -979,7 +982,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin( group_name)); RenderThread::Get()->RecordAction( UserMetricsAction("Plugin_BlockedByPolicy")); @@ -198,7 +198,7 @@ index 700886c6ce89..8a47ec9f91a3 100644 break; } case chrome::mojom::PluginStatus::kBlockedNoLoading: { -@@ -988,7 +992,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin( +@@ -987,7 +991,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin( IDR_BLOCKED_PLUGIN_HTML, l10n_util::GetStringFUTF16(IDS_PLUGIN_BLOCKED_NO_LOADING, group_name)); diff --git a/patch/patches/content_2015.patch b/patch/patches/content_2015.patch index bfd2726ca..3529b90b1 100644 --- a/patch/patches/content_2015.patch +++ b/patch/patches/content_2015.patch @@ -93,10 +93,10 @@ index 2986bf0e340e..6ef8486960ce 100644 } diff --git content/browser/frame_host/render_frame_host_impl.cc content/browser/frame_host/render_frame_host_impl.cc -index 00f36c5deb77..ff5db72358a2 100644 +index c9f6daa998d5..fe6465668896 100644 --- content/browser/frame_host/render_frame_host_impl.cc +++ content/browser/frame_host/render_frame_host_impl.cc -@@ -1527,6 +1527,7 @@ void RenderFrameHostImpl::OnDidFailProvisionalLoadWithError( +@@ -1529,6 +1529,7 @@ void RenderFrameHostImpl::OnDidFailProvisionalLoadWithError( if (GetNavigationHandle()) { GetNavigationHandle()->set_net_error_code( static_cast(params.error_code)); @@ -104,7 +104,7 @@ index 00f36c5deb77..ff5db72358a2 100644 } frame_tree_node_->navigator()->DidFailProvisionalLoadWithError(this, params); -@@ -3278,9 +3279,9 @@ void RenderFrameHostImpl::RegisterMojoInterfaces() { +@@ -3280,9 +3281,9 @@ void RenderFrameHostImpl::RegisterMojoInterfaces() { &QuotaDispatcherHost::CreateForFrame, GetProcess(), routing_id_)); if (base::FeatureList::IsEnabled(network::features::kNetworkService)) { @@ -117,7 +117,7 @@ index 00f36c5deb77..ff5db72358a2 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 -@@ -3554,9 +3555,9 @@ void RenderFrameHostImpl::CommitNavigation( +@@ -3556,9 +3557,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 00f36c5deb77..ff5db72358a2 100644 if (subresource_loader_params && subresource_loader_params->loader_factory_info.is_valid()) { // If the caller has supplied a default URLLoaderFactory override (for -@@ -4171,8 +4172,8 @@ void RenderFrameHostImpl::CreateNetworkServiceDefaultFactoryAndObserve( +@@ -4173,8 +4174,8 @@ void RenderFrameHostImpl::CreateNetworkServiceDefaultFactoryAndObserve( auto* context = GetSiteInstance()->GetBrowserContext(); GetContentClient()->browser()->WillCreateURLLoaderFactory( this, false /* is_navigation */, &default_factory_request); diff --git a/patch/patches/extensions_1947.patch b/patch/patches/extensions_1947.patch index 59dd1260c..0c31a8fcc 100644 --- a/patch/patches/extensions_1947.patch +++ b/patch/patches/extensions_1947.patch @@ -1,5 +1,5 @@ diff --git content/browser/frame_host/render_frame_host_manager.cc content/browser/frame_host/render_frame_host_manager.cc -index e6f6b3012b02..0e939664fb0b 100644 +index 6f16deeb5f4f..f943cfdd053f 100644 --- content/browser/frame_host/render_frame_host_manager.cc +++ content/browser/frame_host/render_frame_host_manager.cc @@ -892,10 +892,11 @@ bool RenderFrameHostManager::ShouldSwapBrowsingInstancesForNavigation( diff --git a/patch/patches/gn_config.patch b/patch/patches/gn_config.patch index ef2c01e19..6b5ea6f3c 100644 --- a/patch/patches/gn_config.patch +++ b/patch/patches/gn_config.patch @@ -132,7 +132,7 @@ index 94c5f759a0dd..a166b6302eeb 100644 if (is_mac) { output_locales = locales_as_mac_outputs diff --git chrome/installer/mini_installer/BUILD.gn chrome/installer/mini_installer/BUILD.gn -index 3ed598db3989..b23170bc4591 100644 +index c44f8a110599..0597d10a54c1 100644 --- chrome/installer/mini_installer/BUILD.gn +++ chrome/installer/mini_installer/BUILD.gn @@ -143,7 +143,7 @@ template("generate_mini_installer") { diff --git a/patch/patches/rwh_background_color_1984.patch b/patch/patches/rwh_background_color_1984.patch index c3b5aced9..f9daf2fc4 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 487198015037..5731dd060375 100644 +index 00bcfa035870..1212e1735c50 100644 --- content/browser/renderer_host/render_widget_host_view_aura.cc +++ content/browser/renderer_host/render_widget_host_view_aura.cc @@ -433,13 +433,6 @@ RenderWidgetHostViewAura::RenderWidgetHostViewAura( @@ -29,7 +29,7 @@ index 487198015037..5731dd060375 100644 } bool RenderWidgetHostViewAura::IsMouseLocked() { -@@ -1922,6 +1917,15 @@ void RenderWidgetHostViewAura::CreateAuraWindow(aura::client::WindowType type) { +@@ -1923,6 +1918,15 @@ void RenderWidgetHostViewAura::CreateAuraWindow(aura::client::WindowType type) { if (frame_sink_id_.is_valid()) window_->SetEmbedFrameSinkId(frame_sink_id_); 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 6eb90b106..b65edef5b 100644 --- a/patch/patches/views_widget_180_1481_1565_1677_1749.patch +++ b/patch/patches/views_widget_180_1481_1565_1677_1749.patch @@ -73,7 +73,7 @@ index 17c07af5e63b..6a408d061790 100644 #if defined(USE_AURA) void OnDidScheduleEmbed(int routing_id, diff --git content/browser/renderer_host/render_widget_host_view_event_handler.cc content/browser/renderer_host/render_widget_host_view_event_handler.cc -index 8318ed172a75..0d6023427bf4 100644 +index d7bb2f78dd6d..dc82d0a4b127 100644 --- content/browser/renderer_host/render_widget_host_view_event_handler.cc +++ content/browser/renderer_host/render_widget_host_view_event_handler.cc @@ -28,6 +28,10 @@ @@ -87,7 +87,7 @@ index 8318ed172a75..0d6023427bf4 100644 #if defined(OS_WIN) #include "content/browser/frame_host/render_frame_host_impl.h" #include "content/public/common/context_menu_params.h" -@@ -880,6 +884,14 @@ void RenderWidgetHostViewEventHandler::SetKeyboardFocus() { +@@ -886,6 +890,14 @@ void RenderWidgetHostViewEventHandler::SetKeyboardFocus() { ::SetFocus(hwnd); } } diff --git a/patch/patches/webview_plugin_2020.patch b/patch/patches/webview_plugin_2020.patch index 8f2f1a1ac..925c883f3 100644 --- a/patch/patches/webview_plugin_2020.patch +++ b/patch/patches/webview_plugin_2020.patch @@ -1,5 +1,5 @@ diff --git chrome/app/generated_resources.grd chrome/app/generated_resources.grd -index 9a8f5efad3b4..d432b917cb48 100644 +index ff7dc5ac85b2..7e3d5c8a5548 100644 --- chrome/app/generated_resources.grd +++ chrome/app/generated_resources.grd @@ -4830,7 +4830,7 @@ Keep your key file in a safe place. You will need it to create new versions of y