From 287664d85f6ee6a81801741cb504814af6f25b25 Mon Sep 17 00:00:00 2001 From: Marshall Greenblatt Date: Tue, 25 Oct 2016 20:19:54 -0400 Subject: [PATCH] Update to Chromium version 55.0.2883.21 --- CHROMIUM_BUILD_COMPATIBILITY.txt | 2 +- .../browser/plugins/plugin_info_message_filter.cc | 3 ++- patch/patches/compositor_1368.patch | 4 ++-- patch/patches/ime_1610.patch | 4 ++-- patch/patches/prefs_content_1161.patch | 4 ++-- patch/patches/web_contents_1257.patch | 12 ++++++------ patch/patches/webkit_popups.patch | 14 +++++++------- patch/patches/webview_plugin_2020.patch | 4 ++-- 8 files changed, 24 insertions(+), 23 deletions(-) diff --git a/CHROMIUM_BUILD_COMPATIBILITY.txt b/CHROMIUM_BUILD_COMPATIBILITY.txt index 03f60c966..450c1bea5 100644 --- a/CHROMIUM_BUILD_COMPATIBILITY.txt +++ b/CHROMIUM_BUILD_COMPATIBILITY.txt @@ -7,5 +7,5 @@ # https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding { - 'chromium_checkout': '614d31daee2f61b0180df403a8ad43f20b9f6dd7', + 'chromium_checkout': 'refs/tags/55.0.2883.21', } diff --git a/libcef/browser/plugins/plugin_info_message_filter.cc b/libcef/browser/plugins/plugin_info_message_filter.cc index b3e176fee..1493a37ed 100644 --- a/libcef/browser/plugins/plugin_info_message_filter.cc +++ b/libcef/browser/plugins/plugin_info_message_filter.cc @@ -312,7 +312,8 @@ void CefPluginInfoMessageFilter::Context::DecidePluginStatus( // TODO(tommycli): Remove once we deprecate the plugin ASK policy. bool legacy_ask_user = plugin_setting == CONTENT_SETTING_ASK; plugin_setting = PluginsFieldTrial::EffectiveContentSetting( - CONTENT_SETTINGS_TYPE_PLUGINS, plugin_setting); + host_content_settings_map_, CONTENT_SETTINGS_TYPE_PLUGINS, + plugin_setting); DCHECK(plugin_setting != CONTENT_SETTING_DEFAULT); DCHECK(plugin_setting != CONTENT_SETTING_ASK); diff --git a/patch/patches/compositor_1368.patch b/patch/patches/compositor_1368.patch index b15141e00..5b09d63e9 100644 --- a/patch/patches/compositor_1368.patch +++ b/patch/patches/compositor_1368.patch @@ -1,8 +1,8 @@ diff --git content/browser/compositor/gpu_process_transport_factory.cc content/browser/compositor/gpu_process_transport_factory.cc -index 73ee42f..b30dc83 100644 +index 49d5d32..eb5415a 100644 --- content/browser/compositor/gpu_process_transport_factory.cc +++ content/browser/compositor/gpu_process_transport_factory.cc -@@ -196,6 +196,13 @@ GpuProcessTransportFactory::~GpuProcessTransportFactory() { +@@ -195,6 +195,13 @@ GpuProcessTransportFactory::~GpuProcessTransportFactory() { std::unique_ptr GpuProcessTransportFactory::CreateSoftwareOutputDevice( ui::Compositor* compositor) { diff --git a/patch/patches/ime_1610.patch b/patch/patches/ime_1610.patch index e860c907a..ed6877eb4 100644 --- a/patch/patches/ime_1610.patch +++ b/patch/patches/ime_1610.patch @@ -1,8 +1,8 @@ diff --git input_method_win.cc input_method_win.cc -index 8975069..858bc9b 100644 +index 6e460e6..4946e67 100644 --- input_method_win.cc +++ input_method_win.cc -@@ -642,8 +642,9 @@ bool InputMethodWin::IsWindowFocused(const TextInputClient* client) const { +@@ -662,8 +662,9 @@ bool InputMethodWin::IsWindowFocused(const TextInputClient* client) const { // receiving keyboard input as long as it is an active window. This works well // even when the |attached_window_handle| becomes active but has not received // WM_FOCUS yet. diff --git a/patch/patches/prefs_content_1161.patch b/patch/patches/prefs_content_1161.patch index 6344b2106..e20b1eb96 100644 --- a/patch/patches/prefs_content_1161.patch +++ b/patch/patches/prefs_content_1161.patch @@ -35,10 +35,10 @@ index 5509a57..d32b4cc 100644 bool inert_visual_viewport; bool record_whole_document; diff --git renderer/render_view_impl.cc renderer/render_view_impl.cc -index 6a461f6..4eba51c 100644 +index 9aefa5e..fb4d3a7 100644 --- renderer/render_view_impl.cc +++ renderer/render_view_impl.cc -@@ -1492,6 +1492,8 @@ void RenderViewImpl::ApplyWebPreferencesInternal( +@@ -1487,6 +1487,8 @@ void RenderViewImpl::ApplyWebPreferencesInternal( blink::WebView* web_view, CompositorDependencies* compositor_deps) { ApplyWebPreferences(prefs, web_view); diff --git a/patch/patches/web_contents_1257.patch b/patch/patches/web_contents_1257.patch index 8db634868..9750058dc 100644 --- a/patch/patches/web_contents_1257.patch +++ b/patch/patches/web_contents_1257.patch @@ -74,10 +74,10 @@ index 5410f5a..a6aaef1 100644 int opener_render_process_id, int opener_render_frame_id, diff --git content/browser/web_contents/web_contents_impl.cc content/browser/web_contents/web_contents_impl.cc -index d7a0cbb..7883136 100644 +index 00421e7..18a9066 100644 --- content/browser/web_contents/web_contents_impl.cc +++ content/browser/web_contents/web_contents_impl.cc -@@ -1577,6 +1577,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) { +@@ -1570,6 +1570,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) { std::string unique_name; frame_tree_.root()->SetFrameName(params.main_frame_name, unique_name); @@ -90,7 +90,7 @@ index d7a0cbb..7883136 100644 WebContentsViewDelegate* delegate = GetContentClient()->browser()->GetWebContentsViewDelegate(this); -@@ -1607,6 +1613,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) { +@@ -1600,6 +1606,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) { std::move(view_), &render_view_host_delegate_view_)); } @@ -98,7 +98,7 @@ index d7a0cbb..7883136 100644 CHECK(render_view_host_delegate_view_); CHECK(view_.get()); -@@ -2060,11 +2067,14 @@ void WebContentsImpl::CreateNewWindow( +@@ -2053,11 +2060,14 @@ void WebContentsImpl::CreateNewWindow( static_cast(session_storage_namespace); CHECK(session_storage_namespace_impl->IsFromContext(dom_storage_context)); @@ -114,7 +114,7 @@ index d7a0cbb..7883136 100644 if (route_id != MSG_ROUTING_NONE && !RenderViewHost::FromID(render_process_id, route_id)) { // If the embedder didn't create a WebContents for this route, we need to -@@ -2088,6 +2098,8 @@ void WebContentsImpl::CreateNewWindow( +@@ -2081,6 +2091,8 @@ void WebContentsImpl::CreateNewWindow( create_params.opener_render_process_id = render_process_id; create_params.opener_render_frame_id = params.opener_render_frame_id; create_params.opener_suppressed = params.opener_suppressed; @@ -139,7 +139,7 @@ index fa0afb5..d677b31 100644 WebContents::CreateParams::CreateParams(const CreateParams& other) = default; diff --git content/public/browser/web_contents.h content/public/browser/web_contents.h -index 8c66b2a..ed523c7 100644 +index 1eb4d7c..1564230 100644 --- content/public/browser/web_contents.h +++ content/public/browser/web_contents.h @@ -59,8 +59,10 @@ class PageState; diff --git a/patch/patches/webkit_popups.patch b/patch/patches/webkit_popups.patch index ac66720a7..af3e83c65 100644 --- a/patch/patches/webkit_popups.patch +++ b/patch/patches/webkit_popups.patch @@ -12,7 +12,7 @@ index f1a79c4..021a083 100644 DCHECK(RuntimeEnabledFeatures::pagePopupEnabled()); diff --git Source/web/WebViewImpl.cpp Source/web/WebViewImpl.cpp -index 966246f..a528578 100644 +index 6c8ca56..3f0d9a8 100644 --- Source/web/WebViewImpl.cpp +++ Source/web/WebViewImpl.cpp @@ -405,6 +405,7 @@ WebViewImpl::WebViewImpl(WebViewClient* client, @@ -23,7 +23,7 @@ index 966246f..a528578 100644 m_doingDragAndDrop(false), m_ignoreInputEvents(false), m_compositorDeviceScaleFactorOverride(0), -@@ -4249,8 +4250,13 @@ void WebViewImpl::mainFrameScrollOffsetChanged() { +@@ -4246,8 +4247,13 @@ void WebViewImpl::mainFrameScrollOffsetChanged() { m_devToolsEmulator->mainFrameScrollOrScaleChanged(); } @@ -39,10 +39,10 @@ index 966246f..a528578 100644 void WebViewImpl::startDragging(LocalFrame* frame, diff --git Source/web/WebViewImpl.h Source/web/WebViewImpl.h -index 8e74ed5..6a37808 100644 +index 238b096..c4feb3b 100644 --- Source/web/WebViewImpl.h +++ Source/web/WebViewImpl.h -@@ -380,7 +380,8 @@ class WEB_EXPORT WebViewImpl final +@@ -379,7 +379,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 8e74ed5..6a37808 100644 bool shouldAutoResize() const { return m_shouldAutoResize; } -@@ -685,6 +686,8 @@ class WEB_EXPORT WebViewImpl final +@@ -684,6 +685,8 @@ class WEB_EXPORT WebViewImpl final float m_fakePageScaleAnimationPageScaleFactor; bool m_fakePageScaleAnimationUseAnchor; @@ -62,10 +62,10 @@ index 8e74ed5..6a37808 100644 bool m_ignoreInputEvents; diff --git public/web/WebView.h public/web/WebView.h -index fde211e..fea968a 100644 +index d877ff0..edfc975 100644 --- public/web/WebView.h +++ public/web/WebView.h -@@ -443,6 +443,7 @@ class WebView : protected WebWidget { +@@ -440,6 +440,7 @@ class WebView : protected WebWidget { // Sets whether select popup menus should be rendered by the browser. BLINK_EXPORT static void setUseExternalPopupMenus(bool); diff --git a/patch/patches/webview_plugin_2020.patch b/patch/patches/webview_plugin_2020.patch index a26c1a65e..b711adf50 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 dbd83a1..acf844e 100644 +index 055cd9d..3a63433 100644 --- chrome/app/generated_resources.grd +++ chrome/app/generated_resources.grd -@@ -7082,7 +7082,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -7073,7 +7073,7 @@ Keep your key file in a safe place. You will need it to create new versions of y