From 069c2fd9f67e3618b6d101e854b25204fb5b670f Mon Sep 17 00:00:00 2001 From: Marshall Greenblatt Date: Mon, 24 Apr 2017 19:57:53 -0400 Subject: [PATCH] Update to Chromium version 58.0.3029.81 --- CHROMIUM_BUILD_COMPATIBILITY.txt | 2 +- patch/patches/compositor_1368.patch | 2 +- patch/patches/navigation_handle.patch | 4 ++-- patch/patches/plugin_info_2015.patch | 18 +++++++++--------- patch/patches/plugin_info_webkit_2015.patch | 12 ++++++------ patch/patches/prefs_content_1161.patch | 10 +++++----- .../render_widget_host_1070383005.patch | 2 +- .../views_widget_180_1481_1565_1677_1749.patch | 2 +- patch/patches/web_contents_1257_1565.patch | 12 ++++++------ patch/patches/webkit_popups.patch | 10 +++++----- patch/patches/webview_plugin_2020.patch | 4 ++-- 11 files changed, 39 insertions(+), 39 deletions(-) diff --git a/CHROMIUM_BUILD_COMPATIBILITY.txt b/CHROMIUM_BUILD_COMPATIBILITY.txt index b84668583..d79cb8fdf 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/58.0.3029.33', + 'chromium_checkout': 'refs/tags/58.0.3029.81', } diff --git a/patch/patches/compositor_1368.patch b/patch/patches/compositor_1368.patch index cbafbfdb7..b13d06d1b 100644 --- a/patch/patches/compositor_1368.patch +++ b/patch/patches/compositor_1368.patch @@ -1,5 +1,5 @@ diff --git content/browser/compositor/gpu_process_transport_factory.cc content/browser/compositor/gpu_process_transport_factory.cc -index 50a66bb..4daaadf 100644 +index aab05cd..d1532b6 100644 --- content/browser/compositor/gpu_process_transport_factory.cc +++ content/browser/compositor/gpu_process_transport_factory.cc @@ -220,6 +220,13 @@ GpuProcessTransportFactory::~GpuProcessTransportFactory() { diff --git a/patch/patches/navigation_handle.patch b/patch/patches/navigation_handle.patch index 9e3f6fdbc..a714775c1 100644 --- a/patch/patches/navigation_handle.patch +++ b/patch/patches/navigation_handle.patch @@ -1,5 +1,5 @@ diff --git content/browser/frame_host/navigation_handle_impl.cc content/browser/frame_host/navigation_handle_impl.cc -index 380b80a12..5992881 100644 +index 4ebe13f1..11ded80 100644 --- content/browser/frame_host/navigation_handle_impl.cc +++ content/browser/frame_host/navigation_handle_impl.cc @@ -257,12 +257,6 @@ net::Error NavigationHandleImpl::GetNetErrorCode() { @@ -16,7 +16,7 @@ index 380b80a12..5992881 100644 } diff --git content/browser/frame_host/render_frame_host_impl.cc content/browser/frame_host/render_frame_host_impl.cc -index ff676db..63f862d 100644 +index e3c2371..c2ce9bc 100644 --- content/browser/frame_host/render_frame_host_impl.cc +++ content/browser/frame_host/render_frame_host_impl.cc @@ -1133,6 +1133,7 @@ void RenderFrameHostImpl::OnDidFailProvisionalLoadWithError( diff --git a/patch/patches/plugin_info_2015.patch b/patch/patches/plugin_info_2015.patch index 1b721f604..1d52fc91c 100644 --- a/patch/patches/plugin_info_2015.patch +++ b/patch/patches/plugin_info_2015.patch @@ -38,10 +38,10 @@ index f8b651f..ec39f8d 100644 content::WebPluginInfo* plugin) override; diff --git chrome/browser/plugins/plugin_info_message_filter.cc chrome/browser/plugins/plugin_info_message_filter.cc -index 75a6fda..84cfc9f 100644 +index 6847272..13c6f5c 100644 --- chrome/browser/plugins/plugin_info_message_filter.cc +++ chrome/browser/plugins/plugin_info_message_filter.cc -@@ -483,8 +483,8 @@ bool PluginInfoMessageFilter::Context::FindEnabledPlugin( +@@ -457,8 +457,8 @@ bool PluginInfoMessageFilter::Context::FindEnabledPlugin( for (; i < matching_plugins.size(); ++i) { if (!filter || filter->IsPluginAvailable(render_process_id_, render_frame_id, @@ -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 023494a..b3728a0 100644 +index 0442702..d0475ce 100644 --- content/common/frame_messages.h +++ content/common/frame_messages.h -@@ -1241,8 +1241,9 @@ IPC_MESSAGE_ROUTED1(FrameHostMsg_PepperStopsPlayback, +@@ -1246,8 +1246,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 023494a..b3728a0 100644 url::Origin /* main_frame_origin */, std::vector /* plugins */) -@@ -1250,9 +1251,10 @@ IPC_SYNC_MESSAGE_CONTROL2_1(FrameHostMsg_GetPlugins, +@@ -1255,9 +1256,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,7 +285,7 @@ index 3b610b1..7c439e0 100644 WebPluginInfo* plugin) = 0; diff --git content/renderer/render_frame_impl.cc content/renderer/render_frame_impl.cc -index 1d6064c..052b804 100644 +index 1af5e8e..3edcdce 100644 --- content/renderer/render_frame_impl.cc +++ content/renderer/render_frame_impl.cc @@ -2757,7 +2757,8 @@ blink::WebPlugin* RenderFrameImpl::createPlugin( @@ -298,7 +298,7 @@ index 1d6064c..052b804 100644 params.mimeType.utf8(), &found, &info, &mime_type)); if (!found) return NULL; -@@ -5261,9 +5262,8 @@ WebNavigationPolicy RenderFrameImpl::decidePolicyForNavigation( +@@ -5264,9 +5265,8 @@ WebNavigationPolicy RenderFrameImpl::decidePolicyForNavigation( (pending_navigation_params_ && !pending_navigation_params_->request_params.redirects.empty()); @@ -310,7 +310,7 @@ index 1d6064c..052b804 100644 // The handlenavigation API is deprecated and will be removed once // crbug.com/325351 is resolved. if (GetContentClient()->renderer()->HandleNavigation( -@@ -5272,7 +5272,6 @@ WebNavigationPolicy RenderFrameImpl::decidePolicyForNavigation( +@@ -5275,7 +5275,6 @@ WebNavigationPolicy RenderFrameImpl::decidePolicyForNavigation( is_redirect)) { return blink::WebNavigationPolicyIgnore; } @@ -319,7 +319,7 @@ index 1d6064c..052b804 100644 Referrer referrer( RenderViewImpl::GetReferrerFromRequest(frame_, info.urlRequest)); diff --git content/renderer/renderer_blink_platform_impl.cc content/renderer/renderer_blink_platform_impl.cc -index ed2baee..19f294b 100644 +index f30b509..a6009f9 100644 --- content/renderer/renderer_blink_platform_impl.cc +++ content/renderer/renderer_blink_platform_impl.cc @@ -712,6 +712,7 @@ blink::WebMIDIAccessor* RendererBlinkPlatformImpl::createMIDIAccessor( diff --git a/patch/patches/plugin_info_webkit_2015.patch b/patch/patches/plugin_info_webkit_2015.patch index eab1c781f..ce95988cc 100644 --- a/patch/patches/plugin_info_webkit_2015.patch +++ b/patch/patches/plugin_info_webkit_2015.patch @@ -15,10 +15,10 @@ index 2b04a24..85653cf 100644 } } diff --git Source/core/frame/LocalFrame.cpp Source/core/frame/LocalFrame.cpp -index 6fa75cf..20cba50 100644 +index 949107e..8a6f58d 100644 --- Source/core/frame/LocalFrame.cpp +++ Source/core/frame/LocalFrame.cpp -@@ -898,6 +898,7 @@ PluginData* LocalFrame::pluginData() const { +@@ -900,6 +900,7 @@ PluginData* LocalFrame::pluginData() const { if (!loader().allowPlugins(NotAboutToInstantiatePlugin)) return nullptr; return page()->pluginData( @@ -27,10 +27,10 @@ index 6fa75cf..20cba50 100644 } diff --git Source/core/page/Page.cpp Source/core/page/Page.cpp -index cb46ff7..7c63196 100644 +index b18bc71..ad01dcf 100644 --- Source/core/page/Page.cpp +++ Source/core/page/Page.cpp -@@ -226,16 +226,26 @@ void Page::refreshPlugins() { +@@ -231,16 +231,26 @@ void Page::refreshPlugins() { for (const Page* page : allPages()) { // Clear out the page's plugin data. @@ -65,7 +65,7 @@ index cb46ff7..7c63196 100644 void Page::setValidationMessageClient(ValidationMessageClient* client) { diff --git Source/core/page/Page.h Source/core/page/Page.h -index 9c429bd..667207e 100644 +index 8fda288..615389b 100644 --- Source/core/page/Page.h +++ Source/core/page/Page.h @@ -130,7 +130,8 @@ class CORE_EXPORT Page final : public GarbageCollectedFinalized, @@ -78,7 +78,7 @@ index 9c429bd..667207e 100644 EditorClient& editorClient() const { return *m_editorClient; } SpellCheckerClient& spellCheckerClient() const { -@@ -285,7 +286,8 @@ class CORE_EXPORT Page final : public GarbageCollectedFinalized, +@@ -286,7 +287,8 @@ class CORE_EXPORT Page final : public GarbageCollectedFinalized, // longer needed. Member m_mainFrame; diff --git a/patch/patches/prefs_content_1161.patch b/patch/patches/prefs_content_1161.patch index a431a10bd..25369cf2c 100644 --- a/patch/patches/prefs_content_1161.patch +++ b/patch/patches/prefs_content_1161.patch @@ -1,5 +1,5 @@ diff --git public/common/common_param_traits_macros.h public/common/common_param_traits_macros.h -index c1b31a8..d5e5f786 100644 +index 95651f7..97359bc 100644 --- public/common/common_param_traits_macros.h +++ public/common/common_param_traits_macros.h @@ -203,6 +203,7 @@ IPC_STRUCT_TRAITS_BEGIN(content::WebPreferences) @@ -11,7 +11,7 @@ index c1b31a8..d5e5f786 100644 IPC_STRUCT_TRAITS_MEMBER(navigate_on_drag_drop) IPC_STRUCT_TRAITS_MEMBER(spatial_navigation_enabled) diff --git public/common/web_preferences.cc public/common/web_preferences.cc -index 56093d3..433e129 100644 +index e67991b..220cc96 100644 --- public/common/web_preferences.cc +++ public/common/web_preferences.cc @@ -173,6 +173,7 @@ WebPreferences::WebPreferences() @@ -23,7 +23,7 @@ index 56093d3..433e129 100644 inert_visual_viewport(false), record_whole_document(false), diff --git public/common/web_preferences.h public/common/web_preferences.h -index 8526cf7..32481c1 100644 +index 07985ab..1a76702 100644 --- public/common/web_preferences.h +++ public/common/web_preferences.h @@ -187,6 +187,7 @@ struct CONTENT_EXPORT WebPreferences { @@ -35,10 +35,10 @@ index 8526cf7..32481c1 100644 bool inert_visual_viewport; bool record_whole_document; diff --git renderer/render_view_impl.cc renderer/render_view_impl.cc -index e69e97a..9983d48 100644 +index c59e978..2ebba64 100644 --- renderer/render_view_impl.cc +++ renderer/render_view_impl.cc -@@ -1403,6 +1403,8 @@ void RenderViewImpl::ApplyWebPreferencesInternal( +@@ -1405,6 +1405,8 @@ void RenderViewImpl::ApplyWebPreferencesInternal( blink::WebView* web_view, CompositorDependencies* compositor_deps) { ApplyWebPreferences(prefs, web_view); diff --git a/patch/patches/render_widget_host_1070383005.patch b/patch/patches/render_widget_host_1070383005.patch index 733f439d9..734e76b23 100644 --- a/patch/patches/render_widget_host_1070383005.patch +++ b/patch/patches/render_widget_host_1070383005.patch @@ -1,5 +1,5 @@ diff --git render_widget_host_view_mac.mm render_widget_host_view_mac.mm -index 9ce93d2..26c059d 100644 +index b7f8bad..22ece7c 100644 --- render_widget_host_view_mac.mm +++ render_widget_host_view_mac.mm @@ -463,9 +463,6 @@ RenderWidgetHostViewMac::RenderWidgetHostViewMac(RenderWidgetHost* widget, 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 bfcadff85..b1cab4a96 100644 --- a/patch/patches/views_widget_180_1481_1565_1677_1749.patch +++ b/patch/patches/views_widget_180_1481_1565_1677_1749.patch @@ -71,7 +71,7 @@ index 657ad20..fcd514a 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 628aa29..f2098f9 100644 +index f19b0c3..df2727e 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 @@ diff --git a/patch/patches/web_contents_1257_1565.patch b/patch/patches/web_contents_1257_1565.patch index 8057fd2e7..851acae94 100644 --- a/patch/patches/web_contents_1257_1565.patch +++ b/patch/patches/web_contents_1257_1565.patch @@ -1,8 +1,8 @@ diff --git content/browser/web_contents/web_contents_impl.cc content/browser/web_contents/web_contents_impl.cc -index 0d42f07..b29997d 100644 +index e3076d2..42927cf 100644 --- content/browser/web_contents/web_contents_impl.cc +++ content/browser/web_contents/web_contents_impl.cc -@@ -1571,6 +1571,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) { +@@ -1576,6 +1576,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) { std::string unique_name; frame_tree_.root()->SetFrameName(params.main_frame_name, unique_name); @@ -15,7 +15,7 @@ index 0d42f07..b29997d 100644 WebContentsViewDelegate* delegate = GetContentClient()->browser()->GetWebContentsViewDelegate(this); -@@ -1581,6 +1587,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) { +@@ -1586,6 +1592,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) { view_.reset(CreateWebContentsView(this, delegate, &render_view_host_delegate_view_)); } @@ -23,7 +23,7 @@ index 0d42f07..b29997d 100644 if (browser_plugin_guest_ && !GuestMode::IsCrossProcessFrameGuest(this)) { view_.reset(new WebContentsViewGuest(this, browser_plugin_guest_.get(), -@@ -2093,6 +2100,15 @@ void WebContentsImpl::CreateNewWindow( +@@ -2100,6 +2107,15 @@ void WebContentsImpl::CreateNewWindow( create_params.renderer_initiated_creation = main_frame_route_id != MSG_ROUTING_NONE; @@ -39,7 +39,7 @@ index 0d42f07..b29997d 100644 WebContentsImpl* new_contents = NULL; if (!is_guest) { create_params.context = view_->GetNativeView(); -@@ -2122,7 +2138,7 @@ void WebContentsImpl::CreateNewWindow( +@@ -2129,7 +2145,7 @@ void WebContentsImpl::CreateNewWindow( // TODO(brettw): It seems bogus that we have to call this function on the // newly created object and give it one of its own member variables. new_view->CreateViewForWidget( @@ -48,7 +48,7 @@ index 0d42f07..b29997d 100644 } // Save the created window associated with the route so we can show it // later. -@@ -4973,7 +4989,7 @@ NavigationEntry* +@@ -4985,7 +5001,7 @@ NavigationEntry* 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 bad572494..dd5be39d1 100644 --- a/patch/patches/webkit_popups.patch +++ b/patch/patches/webkit_popups.patch @@ -12,7 +12,7 @@ index 48385f8..a11804b 100644 DCHECK(RuntimeEnabledFeatures::pagePopupEnabled()); diff --git Source/web/WebViewImpl.cpp Source/web/WebViewImpl.cpp -index 365a716..c1519f8 100644 +index 5b5fef6..ef4f665 100644 --- Source/web/WebViewImpl.cpp +++ Source/web/WebViewImpl.cpp @@ -357,6 +357,7 @@ WebViewImpl::WebViewImpl(WebViewClient* client, @@ -23,7 +23,7 @@ index 365a716..c1519f8 100644 m_compositorDeviceScaleFactorOverride(0), m_suppressNextKeypressEvent(false), m_imeAcceptEvents(true), -@@ -3699,8 +3700,13 @@ void WebViewImpl::mainFrameScrollOffsetChanged() { +@@ -3704,8 +3705,13 @@ void WebViewImpl::mainFrameScrollOffsetChanged() { m_devToolsEmulator->mainFrameScrollOrScaleChanged(); } @@ -39,10 +39,10 @@ index 365a716..c1519f8 100644 void WebViewImpl::setBackgroundColorOverride(WebColor color) { diff --git Source/web/WebViewImpl.h Source/web/WebViewImpl.h -index f94b695..4828185 100644 +index 354e52e..c2058f3 100644 --- Source/web/WebViewImpl.h +++ Source/web/WebViewImpl.h -@@ -369,7 +369,8 @@ class WEB_EXPORT WebViewImpl final +@@ -370,7 +370,8 @@ class WEB_EXPORT WebViewImpl final // Returns true if popup menus should be rendered by the browser, false if // they should be rendered by WebKit (which is the default). @@ -52,7 +52,7 @@ index f94b695..4828185 100644 bool shouldAutoResize() const { return m_shouldAutoResize; } -@@ -652,6 +653,8 @@ class WEB_EXPORT WebViewImpl final +@@ -653,6 +654,8 @@ class WEB_EXPORT WebViewImpl final float m_fakePageScaleAnimationPageScaleFactor; bool m_fakePageScaleAnimationUseAnchor; diff --git a/patch/patches/webview_plugin_2020.patch b/patch/patches/webview_plugin_2020.patch index a6d22debf..e58c6af57 100644 --- a/patch/patches/webview_plugin_2020.patch +++ b/patch/patches/webview_plugin_2020.patch @@ -1,8 +1,8 @@ diff --git chrome/app/generated_resources.grd chrome/app/generated_resources.grd -index b2bcd42..fad892d 100644 +index 81b3556..e235465 100644 --- chrome/app/generated_resources.grd +++ chrome/app/generated_resources.grd -@@ -6771,7 +6771,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -6779,7 +6779,7 @@ Keep your key file in a safe place. You will need it to create new versions of y