From ae07baa5e16d9ff8d0deeb9ed5b36cf9ae42bf46 Mon Sep 17 00:00:00 2001 From: Marshall Greenblatt Date: Fri, 3 Feb 2017 14:39:19 -0500 Subject: [PATCH] Update to Chromium version 57.0.2987.21 --- CHROMIUM_BUILD_COMPATIBILITY.txt | 2 +- patch/patches/browser_compositor_mac.patch | 4 ++-- patch/patches/crashpad_1995.patch | 8 ++++---- patch/patches/plugin_info_2015.patch | 18 +++++++++--------- patch/patches/plugin_info_webkit_2015.patch | 4 ++-- patch/patches/prefs_content_1161.patch | 4 ++-- .../print_header_footer_1478_1565.patch | 8 ++++---- .../render_widget_host_1070383005.patch | 4 ++-- patch/patches/rwh_background_color_1984.patch | 2 +- patch/patches/storage_partition_1973.patch | 16 ++++++++-------- .../views_widget_180_1481_1677_1749.patch | 4 ++-- patch/patches/web_contents_1257.patch | 2 +- patch/patches/webkit_popups.patch | 4 ++-- patch/patches/webview_plugin_2020.patch | 2 +- 14 files changed, 41 insertions(+), 41 deletions(-) diff --git a/CHROMIUM_BUILD_COMPATIBILITY.txt b/CHROMIUM_BUILD_COMPATIBILITY.txt index b1a7d4dd9..e99dc8d36 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/57.0.2987.8', + 'chromium_checkout': 'refs/tags/57.0.2987.21', } diff --git a/patch/patches/browser_compositor_mac.patch b/patch/patches/browser_compositor_mac.patch index a33e6bc61..f6db713fd 100644 --- a/patch/patches/browser_compositor_mac.patch +++ b/patch/patches/browser_compositor_mac.patch @@ -18,7 +18,7 @@ diff --git content/browser/renderer_host/browser_compositor_view_mac.mm content/ index bd36336..9123781 100644 --- content/browser/renderer_host/browser_compositor_view_mac.mm +++ content/browser/renderer_host/browser_compositor_view_mac.mm -@@ -201,6 +201,12 @@ BrowserCompositorMac::~BrowserCompositorMac() { +@@ -201,6 +201,12 @@ void OnCompositingShuttingDown(ui::Compositor* compositor) override {} g_spare_recyclable_compositors.Get().clear(); } @@ -31,7 +31,7 @@ index bd36336..9123781 100644 ui::AcceleratedWidgetMac* BrowserCompositorMac::GetAcceleratedWidgetMac() { if (recyclable_compositor_) return recyclable_compositor_->accelerated_widget_mac(); -@@ -417,8 +423,13 @@ SkColor BrowserCompositorMac::DelegatedFrameHostGetGutterColor( +@@ -417,8 +423,13 @@ void OnCompositingShuttingDown(ui::Compositor* compositor) override {} } gfx::Size BrowserCompositorMac::DelegatedFrameHostDesiredSizeInDIP() const { diff --git a/patch/patches/crashpad_1995.patch b/patch/patches/crashpad_1995.patch index 8047ead1b..dc921fe6c 100644 --- a/patch/patches/crashpad_1995.patch +++ b/patch/patches/crashpad_1995.patch @@ -429,7 +429,7 @@ index 7df66ea..4ee709a 100644 #include "third_party/crashpad/crashpad/client/crash_report_database.h" #include "third_party/crashpad/crashpad/client/crashpad_client.h" #include "third_party/crashpad/crashpad/client/crashpad_info.h" -@@ -40,9 +43,10 @@ base::FilePath PlatformCrashpadInitialization(bool initial_client, +@@ -40,9 +43,10 @@ if (initial_client) { @autoreleasepool { @@ -443,7 +443,7 @@ index 7df66ea..4ee709a 100644 // Is there a way to recover if this fails? CrashReporterClient* crash_reporter_client = GetCrashReporterClient(); -@@ -54,16 +58,27 @@ base::FilePath PlatformCrashpadInitialization(bool initial_client, +@@ -54,16 +58,27 @@ // crash server won't have symbols for any other build types. std::string url = "https://clients2.google.com/cr/report"; #else @@ -476,7 +476,7 @@ index 7df66ea..4ee709a 100644 #if defined(GOOGLE_CHROME_BUILD) NSString* channel = base::mac::ObjCCast( -@@ -73,12 +88,16 @@ base::FilePath PlatformCrashpadInitialization(bool initial_client, +@@ -73,12 +88,16 @@ } #endif @@ -498,7 +498,7 @@ index 7df66ea..4ee709a 100644 std::vector arguments; if (!browser_process) { -@@ -90,6 +109,12 @@ base::FilePath PlatformCrashpadInitialization(bool initial_client, +@@ -90,6 +109,12 @@ "--reset-own-crash-exception-port-to-system-default"); } diff --git a/patch/patches/plugin_info_2015.patch b/patch/patches/plugin_info_2015.patch index 9104958a3..671d99f09 100644 --- a/patch/patches/plugin_info_2015.patch +++ b/patch/patches/plugin_info_2015.patch @@ -1,8 +1,8 @@ diff --git chrome/browser/download/download_target_determiner.cc chrome/browser/download/download_target_determiner.cc -index 8949f08..45a0640 100644 +index 5c071c7..6d3c129 100644 --- chrome/browser/download/download_target_determiner.cc +++ chrome/browser/download/download_target_determiner.cc -@@ -478,8 +478,8 @@ void IsHandledBySafePlugin(content::ResourceContext* resource_context, +@@ -483,8 +483,8 @@ void IsHandledBySafePlugin(content::ResourceContext* resource_context, content::PluginService* plugin_service = content::PluginService::GetInstance(); bool plugin_found = plugin_service->GetPluginInfo( @@ -210,10 +210,10 @@ index 3e92d37..ecd8493 100644 const std::string& mime_type, bool allow_wildcard, diff --git content/common/frame_messages.h content/common/frame_messages.h -index 9092344..efcdb7f 100644 +index 0e7dbe0..c783952 100644 --- content/common/frame_messages.h +++ content/common/frame_messages.h -@@ -1187,8 +1187,9 @@ IPC_MESSAGE_ROUTED1(FrameHostMsg_PepperStopsPlayback, +@@ -1191,8 +1191,9 @@ IPC_MESSAGE_ROUTED1(FrameHostMsg_PepperStopsPlayback, // Used to get the list of plugins. |main_frame_origin| is used to handle // exceptions for plugin content settings. @@ -224,7 +224,7 @@ index 9092344..efcdb7f 100644 url::Origin /* main_frame_origin */, std::vector /* plugins */) -@@ -1196,9 +1197,10 @@ IPC_SYNC_MESSAGE_CONTROL2_1(FrameHostMsg_GetPlugins, +@@ -1200,9 +1201,10 @@ IPC_SYNC_MESSAGE_CONTROL2_1(FrameHostMsg_GetPlugins, // type. If there is no matching plugin, |found| is false. // |actual_mime_type| is the actual mime type supported by the // found plugin. @@ -285,10 +285,10 @@ index 3b610b1..7c439e0 100644 WebPluginInfo* plugin) = 0; diff --git content/renderer/render_frame_impl.cc content/renderer/render_frame_impl.cc -index 2d93238..d511e99 100644 +index c9c9602..9a4de98 100644 --- content/renderer/render_frame_impl.cc +++ content/renderer/render_frame_impl.cc -@@ -2749,7 +2749,8 @@ blink::WebPlugin* RenderFrameImpl::createPlugin( +@@ -2753,7 +2753,8 @@ blink::WebPlugin* RenderFrameImpl::createPlugin( std::string mime_type; bool found = false; Send(new FrameHostMsg_GetPluginInfo( @@ -298,7 +298,7 @@ index 2d93238..d511e99 100644 params.mimeType.utf8(), &found, &info, &mime_type)); if (!found) return NULL; -@@ -5259,9 +5260,8 @@ WebNavigationPolicy RenderFrameImpl::decidePolicyForNavigation( +@@ -5263,9 +5264,8 @@ WebNavigationPolicy RenderFrameImpl::decidePolicyForNavigation( (pending_navigation_params_ && !pending_navigation_params_->request_params.redirects.empty()); @@ -310,7 +310,7 @@ index 2d93238..d511e99 100644 // The handlenavigation API is deprecated and will be removed once // crbug.com/325351 is resolved. if (GetContentClient()->renderer()->HandleNavigation( -@@ -5270,7 +5270,6 @@ WebNavigationPolicy RenderFrameImpl::decidePolicyForNavigation( +@@ -5274,7 +5274,6 @@ WebNavigationPolicy RenderFrameImpl::decidePolicyForNavigation( is_redirect)) { return blink::WebNavigationPolicyIgnore; } diff --git a/patch/patches/plugin_info_webkit_2015.patch b/patch/patches/plugin_info_webkit_2015.patch index 1fa0cfe6b..61dbb5e43 100644 --- a/patch/patches/plugin_info_webkit_2015.patch +++ b/patch/patches/plugin_info_webkit_2015.patch @@ -27,7 +27,7 @@ index 03edc5d..b9a91db 100644 } diff --git Source/core/page/Page.cpp Source/core/page/Page.cpp -index 671df37..27c7d6b 100644 +index a48697d..cc84a70 100644 --- Source/core/page/Page.cpp +++ Source/core/page/Page.cpp @@ -239,16 +239,26 @@ void Page::refreshPlugins() { @@ -65,7 +65,7 @@ index 671df37..27c7d6b 100644 void Page::setValidationMessageClient(ValidationMessageClient* client) { diff --git Source/core/page/Page.h Source/core/page/Page.h -index 133260a..0aef9f2 100644 +index c23e07a..56afc93 100644 --- Source/core/page/Page.h +++ Source/core/page/Page.h @@ -127,7 +127,8 @@ class CORE_EXPORT Page final : public GarbageCollectedFinalized, diff --git a/patch/patches/prefs_content_1161.patch b/patch/patches/prefs_content_1161.patch index 15cbefe95..abeaccdee 100644 --- a/patch/patches/prefs_content_1161.patch +++ b/patch/patches/prefs_content_1161.patch @@ -35,10 +35,10 @@ index 4835144..16fa0ad 100644 bool inert_visual_viewport; bool record_whole_document; diff --git renderer/render_view_impl.cc renderer/render_view_impl.cc -index 7083f7d..e307222 100644 +index 7742f44..c4fabdc 100644 --- renderer/render_view_impl.cc +++ renderer/render_view_impl.cc -@@ -1389,6 +1389,8 @@ void RenderViewImpl::ApplyWebPreferencesInternal( +@@ -1390,6 +1390,8 @@ void RenderViewImpl::ApplyWebPreferencesInternal( blink::WebView* web_view, CompositorDependencies* compositor_deps) { ApplyWebPreferences(prefs, web_view); diff --git a/patch/patches/print_header_footer_1478_1565.patch b/patch/patches/print_header_footer_1478_1565.patch index 19fd917a0..a3efd1460 100644 --- a/patch/patches/print_header_footer_1478_1565.patch +++ b/patch/patches/print_header_footer_1478_1565.patch @@ -24,7 +24,7 @@ index 7ec0135..9f68626 100644 using content::NavigationController; using content::NavigationEntry; using content::OpenURLParams; -@@ -231,11 +235,15 @@ void ResumeAppleEventAndSendReply(NSAppleEventManagerSuspensionID suspension_id, +@@ -231,11 +235,15 @@ - (void)handlesStopScriptCommand:(NSScriptCommand*)command { - (void)handlesPrintScriptCommand:(NSScriptCommand*)command { AppleScript::LogAppleScriptUMA(AppleScript::AppleScriptCommand::TAB_PRINT); @@ -537,7 +537,7 @@ diff --git components/printing/renderer/print_web_view_helper_mac.mm components/ index ff49472..b107439 100644 --- components/printing/renderer/print_web_view_helper_mac.mm +++ components/printing/renderer/print_web_view_helper_mac.mm -@@ -69,7 +69,6 @@ void PrintWebViewHelper::PrintPageInternal( +@@ -69,7 +69,6 @@ Send(new PrintHostMsg_DidPrintPage(routing_id(), page_params)); } @@ -545,7 +545,7 @@ index ff49472..b107439 100644 bool PrintWebViewHelper::RenderPreviewPage( int page_number, const PrintMsg_Print_Params& print_params) { -@@ -106,7 +105,6 @@ bool PrintWebViewHelper::RenderPreviewPage( +@@ -106,7 +105,6 @@ } return PreviewPageRendered(page_number, draft_metafile.get()); } @@ -553,7 +553,7 @@ index ff49472..b107439 100644 void PrintWebViewHelper::RenderPage(const PrintMsg_Print_Params& params, int page_number, -@@ -142,14 +140,12 @@ void PrintWebViewHelper::RenderPage(const PrintMsg_Print_Params& params, +@@ -142,14 +140,12 @@ MetafileSkiaWrapper::SetMetafileOnCanvas(*canvas, metafile); skia::SetIsPreviewMetafile(*canvas, is_preview); diff --git a/patch/patches/render_widget_host_1070383005.patch b/patch/patches/render_widget_host_1070383005.patch index 9b314528f..9df5ce202 100644 --- a/patch/patches/render_widget_host_1070383005.patch +++ b/patch/patches/render_widget_host_1070383005.patch @@ -1,8 +1,8 @@ diff --git render_widget_host_view_mac.mm render_widget_host_view_mac.mm -index 53c4808..21d741a 100644 +index c91614f..622c839 100644 --- render_widget_host_view_mac.mm +++ render_widget_host_view_mac.mm -@@ -462,9 +462,6 @@ RenderWidgetHostViewMac::RenderWidgetHostViewMac(RenderWidgetHost* widget, +@@ -462,9 +462,6 @@ float FlipYFromRectToScreen(float y, float rect_height) { // Paint this view host with |background_color_| when there is no content // ready to draw. background_layer_.reset([[CALayer alloc] init]); diff --git a/patch/patches/rwh_background_color_1984.patch b/patch/patches/rwh_background_color_1984.patch index b1d2cc630..d9157b70f 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 6cd8721..2f54816 100644 +index ddbf5a2..600e94c5 100644 --- content/browser/renderer_host/render_widget_host_view_aura.cc +++ content/browser/renderer_host/render_widget_host_view_aura.cc @@ -746,8 +746,10 @@ void RenderWidgetHostViewAura::SetBackgroundColor(SkColor color) { diff --git a/patch/patches/storage_partition_1973.patch b/patch/patches/storage_partition_1973.patch index 6939aecfd..805fe068a 100644 --- a/patch/patches/storage_partition_1973.patch +++ b/patch/patches/storage_partition_1973.patch @@ -103,7 +103,7 @@ index 242d33e..4dfb463 100644 BrowserThread::PostTask(BrowserThread::IO, FROM_HERE, diff --git content/browser/renderer_host/render_process_host_impl.cc content/browser/renderer_host/render_process_host_impl.cc -index 5e75c17..28fdb04 100644 +index fb985cd..41d281d 100644 --- content/browser/renderer_host/render_process_host_impl.cc +++ content/browser/renderer_host/render_process_host_impl.cc @@ -653,7 +653,7 @@ void RenderProcessHostImpl::EarlyZygoteLaunch() { @@ -249,10 +249,10 @@ index 5e75c17..28fdb04 100644 + static_cast( + storage_partition_impl_->GetPlatformNotificationContext()); + - channel_->AddAssociatedInterface( - base::Bind(&RenderProcessHostImpl::OnRouteProviderRequest, - base::Unretained(this))); -@@ -1234,8 +1252,7 @@ void RenderProcessHostImpl::RegisterMojoInterfaces() { + channel_->AddAssociatedInterfaceForIOThread( + base::Bind(&IndexedDBDispatcherHost::AddBinding, indexed_db_factory_)); + +@@ -1230,8 +1248,7 @@ void RenderProcessHostImpl::RegisterMojoInterfaces() { AddUIThreadInterface( registry.get(), base::Bind(&PlatformNotificationContextImpl::CreateService, @@ -262,7 +262,7 @@ index 5e75c17..28fdb04 100644 GetID())); AddUIThreadInterface( registry.get(), -@@ -1428,6 +1445,7 @@ void RenderProcessHostImpl::ForceReleaseWorkerRefCounts() { +@@ -1424,6 +1441,7 @@ void RenderProcessHostImpl::ForceReleaseWorkerRefCounts() { DCHECK_CURRENTLY_ON(BrowserThread::UI); DCHECK(!is_worker_ref_count_disabled_); is_worker_ref_count_disabled_ = true; @@ -271,7 +271,7 @@ index 5e75c17..28fdb04 100644 return; service_worker_ref_count_ = 0; diff --git content/browser/renderer_host/render_process_host_impl.h content/browser/renderer_host/render_process_host_impl.h -index 75895e1..ccc5e00 100644 +index dc269f2..ded7607 100644 --- content/browser/renderer_host/render_process_host_impl.h +++ content/browser/renderer_host/render_process_host_impl.h @@ -71,7 +71,6 @@ class RenderWidgetHelper; @@ -291,7 +291,7 @@ index 75895e1..ccc5e00 100644 bool is_for_guests_only); ~RenderProcessHostImpl() override; -@@ -508,7 +507,7 @@ class CONTENT_EXPORT RenderProcessHostImpl +@@ -509,7 +508,7 @@ class CONTENT_EXPORT RenderProcessHostImpl BrowserContext* browser_context_; // Owned by |browser_context_|. diff --git a/patch/patches/views_widget_180_1481_1677_1749.patch b/patch/patches/views_widget_180_1481_1677_1749.patch index 25b3b4808..5ea1c3a46 100644 --- a/patch/patches/views_widget_180_1481_1677_1749.patch +++ b/patch/patches/views_widget_180_1481_1677_1749.patch @@ -50,7 +50,7 @@ index 08aad92..c18da2d 100644 void FlushInput(); 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 2307c54..7944580 100644 +index bd96819..ff1d25b 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 @@ @@ -64,7 +64,7 @@ index 2307c54..7944580 100644 #if defined(OS_WIN) #include "content/browser/frame_host/render_frame_host_impl.h" #include "content/public/common/context_menu_params.h" -@@ -805,6 +809,14 @@ void RenderWidgetHostViewEventHandler::SetKeyboardFocus() { +@@ -809,6 +813,14 @@ void RenderWidgetHostViewEventHandler::SetKeyboardFocus() { } } #endif diff --git a/patch/patches/web_contents_1257.patch b/patch/patches/web_contents_1257.patch index 4deee1fac..659a8aa23 100644 --- a/patch/patches/web_contents_1257.patch +++ b/patch/patches/web_contents_1257.patch @@ -29,7 +29,7 @@ index 992160d..b5dcc72 100644 void EnterFullscreenModeForTab(content::WebContents* contents, const GURL& origin) final; diff --git chrome/browser/prerender/prerender_contents.cc chrome/browser/prerender/prerender_contents.cc -index aea147d..cac0c15 100644 +index cbff038..1526c1a 100644 --- chrome/browser/prerender/prerender_contents.cc +++ chrome/browser/prerender/prerender_contents.cc @@ -142,7 +142,9 @@ class PrerenderContents::WebContentsDelegateImpl diff --git a/patch/patches/webkit_popups.patch b/patch/patches/webkit_popups.patch index 01d45b270..c2ff033a0 100644 --- a/patch/patches/webkit_popups.patch +++ b/patch/patches/webkit_popups.patch @@ -12,7 +12,7 @@ index 11d980e..a87fb7e 100644 DCHECK(RuntimeEnabledFeatures::pagePopupEnabled()); diff --git Source/web/WebViewImpl.cpp Source/web/WebViewImpl.cpp -index 6a7688b..7ca2fab 100644 +index 24a1fbf..b51ca5f 100644 --- Source/web/WebViewImpl.cpp +++ Source/web/WebViewImpl.cpp @@ -358,6 +358,7 @@ WebViewImpl::WebViewImpl(WebViewClient* client, @@ -39,7 +39,7 @@ index 6a7688b..7ca2fab 100644 void WebViewImpl::setBackgroundColorOverride(WebColor color) { diff --git Source/web/WebViewImpl.h Source/web/WebViewImpl.h -index e4ad02f..8bfaa1c 100644 +index 340464e..3be47f3 100644 --- Source/web/WebViewImpl.h +++ Source/web/WebViewImpl.h @@ -371,7 +371,8 @@ class WEB_EXPORT WebViewImpl final diff --git a/patch/patches/webview_plugin_2020.patch b/patch/patches/webview_plugin_2020.patch index bb9a6da83..8dcc3a0b8 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 16f2d57..059291e 100644 +index 28e8a17..84a3814 100644 --- chrome/app/generated_resources.grd +++ chrome/app/generated_resources.grd @@ -7137,7 +7137,7 @@ Keep your key file in a safe place. You will need it to create new versions of y