From bdae0bf33522b12ffc3dd23d77bece512ccb9386 Mon Sep 17 00:00:00 2001 From: Marshall Greenblatt Date: Thu, 15 Oct 2015 11:13:53 -0400 Subject: [PATCH] Update to Chromium version 47.0.2526.16 --- CHROMIUM_BUILD_COMPATIBILITY.txt | 2 +- patch/patches/chrome_browser_1257.patch | 2 +- patch/patches/content_nav_1129.patch | 90 +++++++++-------------- patch/patches/public_browser_1257.patch | 4 +- patch/patches/views_widget_180_1677.patch | 12 +-- 5 files changed, 46 insertions(+), 64 deletions(-) diff --git a/CHROMIUM_BUILD_COMPATIBILITY.txt b/CHROMIUM_BUILD_COMPATIBILITY.txt index d7b3766ae..5df66e9ac 100644 --- a/CHROMIUM_BUILD_COMPATIBILITY.txt +++ b/CHROMIUM_BUILD_COMPATIBILITY.txt @@ -7,5 +7,5 @@ # https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding { - 'chromium_checkout': 'cb947c0153db0ec02a8abbcb3ca086d88bf6006f', + 'chromium_checkout': 'refs/tags/47.0.2526.16', } diff --git a/patch/patches/chrome_browser_1257.patch b/patch/patches/chrome_browser_1257.patch index e170c5fe3..f8f896e97 100644 --- a/patch/patches/chrome_browser_1257.patch +++ b/patch/patches/chrome_browser_1257.patch @@ -1,5 +1,5 @@ diff --git ui/browser.cc ui/browser.cc -index 36d24b6..bbc5075 100644 +index 464d53d..57752e1 100644 --- ui/browser.cc +++ ui/browser.cc @@ -1669,7 +1669,9 @@ bool Browser::ShouldCreateWebContents( diff --git a/patch/patches/content_nav_1129.patch b/patch/patches/content_nav_1129.patch index 3fe934310..e16897221 100644 --- a/patch/patches/content_nav_1129.patch +++ b/patch/patches/content_nav_1129.patch @@ -1,78 +1,60 @@ diff --git public/renderer/content_renderer_client.cc public/renderer/content_renderer_client.cc -index e09e803..ff26996 100644 +index 245776d..ff26996 100644 --- public/renderer/content_renderer_client.cc +++ public/renderer/content_renderer_client.cc -@@ -98,6 +98,18 @@ bool ContentRendererClient::AllowPopup() { +@@ -98,7 +98,6 @@ bool ContentRendererClient::AllowPopup() { return false; } -+bool ContentRendererClient::HandleNavigation( -+ RenderFrame* render_frame, -+ DocumentState* document_state, -+ int opener_id, -+ blink::WebFrame* frame, -+ const blink::WebURLRequest& request, -+ blink::WebNavigationType type, -+ blink::WebNavigationPolicy default_policy, -+ bool is_redirect) { -+ return false; -+} -+ +-#ifdef OS_ANDROID + bool ContentRendererClient::HandleNavigation( + RenderFrame* render_frame, + DocumentState* document_state, +@@ -110,7 +109,6 @@ bool ContentRendererClient::HandleNavigation( + bool is_redirect) { + return false; + } +-#endif + bool ContentRendererClient::ShouldFork(blink::WebLocalFrame* frame, const GURL& url, - const std::string& http_method, diff --git public/renderer/content_renderer_client.h public/renderer/content_renderer_client.h -index df8d501..f3a2068 100644 +index 5adc6ff..88663e1 100644 --- public/renderer/content_renderer_client.h +++ public/renderer/content_renderer_client.h -@@ -16,6 +16,8 @@ - #include "base/strings/string16.h" - #include "content/public/common/content_client.h" - #include "third_party/WebKit/public/platform/WebPageVisibilityState.h" -+#include "third_party/WebKit/public/web/WebNavigationPolicy.h" -+#include "third_party/WebKit/public/web/WebNavigationType.h" - #include "ui/base/page_transition_types.h" - #include "v8/include/v8.h" - -@@ -191,6 +193,17 @@ class CONTENT_EXPORT ContentRendererClient { +@@ -193,7 +193,6 @@ class CONTENT_EXPORT ContentRendererClient { // Returns true if a popup window should be allowed. virtual bool AllowPopup(); -+ // Returns true if the navigation was handled by the embedder and should be -+ // ignored by WebKit. This method is used by CEF and android_webview. -+ virtual bool HandleNavigation(RenderFrame* render_frame, -+ DocumentState* document_state, -+ int opener_id, -+ blink::WebFrame* frame, -+ const blink::WebURLRequest& request, -+ blink::WebNavigationType type, -+ blink::WebNavigationPolicy default_policy, -+ bool is_redirect); -+ +-#ifdef OS_ANDROID + // TODO(sgurun) This callback is deprecated and will be removed as soon + // as android webview completes implementation of a resource throttle based + // shouldoverrideurl implementation. See crbug.com/325351 +@@ -208,7 +207,6 @@ class CONTENT_EXPORT ContentRendererClient { + blink::WebNavigationType type, + blink::WebNavigationPolicy default_policy, + bool is_redirect); +-#endif + // Returns true if we should fork a new process for the given navigation. // If |send_referrer| is set to false (which is the default), no referrer - // header will be send for the navigation. Otherwise, the referrer header is diff --git renderer/render_frame_impl.cc renderer/render_frame_impl.cc -index ff5d269..6ca4948 100644 +index 7582290..e153c32 100644 --- renderer/render_frame_impl.cc +++ renderer/render_frame_impl.cc -@@ -4274,6 +4274,19 @@ void RenderFrameImpl::OnFailedNavigation( +@@ -4274,7 +4274,6 @@ void RenderFrameImpl::OnFailedNavigation( WebNavigationPolicy RenderFrameImpl::DecidePolicyForNavigation( RenderFrame* render_frame, const NavigationPolicyInfo& info) { -+ if (info.urlRequest.url() != GURL(kSwappedOutURL) && -+ GetContentClient()->renderer()->HandleNavigation( -+ render_frame, -+ static_cast(info.extraData), -+ render_view_->opener_id_, -+ info.frame, -+ info.urlRequest, -+ info.navigationType, -+ info.defaultPolicy, -+ info.isRedirect)) { -+ return blink::WebNavigationPolicyIgnore; -+ } -+ +-#ifdef OS_ANDROID + // The handlenavigation API is deprecated and will be removed once + // crbug.com/325351 is resolved. + if (info.urlRequest.url() != GURL(kSwappedOutURL) && +@@ -4284,7 +4283,6 @@ WebNavigationPolicy RenderFrameImpl::DecidePolicyForNavigation( + info.navigationType, info.defaultPolicy, info.isRedirect)) { + return blink::WebNavigationPolicyIgnore; + } +-#endif + Referrer referrer(RenderViewImpl::GetReferrerFromRequest(info.frame, info.urlRequest)); - diff --git a/patch/patches/public_browser_1257.patch b/patch/patches/public_browser_1257.patch index f29785c44..2b3197a51 100644 --- a/patch/patches/public_browser_1257.patch +++ b/patch/patches/public_browser_1257.patch @@ -52,7 +52,7 @@ index 08c5ba9..459fe19 100644 // Creates a new WebContents. diff --git web_contents_delegate.cc web_contents_delegate.cc -index b3d2d70..727401c 100644 +index 3d18cee..b9ed440 100644 --- web_contents_delegate.cc +++ web_contents_delegate.cc @@ -138,7 +138,9 @@ bool WebContentsDelegate::ShouldCreateWebContents( @@ -67,7 +67,7 @@ index b3d2d70..727401c 100644 } diff --git web_contents_delegate.h web_contents_delegate.h -index 76dfd36..f3bec13 100644 +index 9c344f2..439c243 100644 --- web_contents_delegate.h +++ web_contents_delegate.h @@ -39,9 +39,11 @@ class DownloadItem; diff --git a/patch/patches/views_widget_180_1677.patch b/patch/patches/views_widget_180_1677.patch index e03716403..a191b1a31 100644 --- a/patch/patches/views_widget_180_1677.patch +++ b/patch/patches/views_widget_180_1677.patch @@ -12,7 +12,7 @@ index a8e088c..838b6a0 100644 return host ? host->GetAcceleratedWidget() : NULL; } diff --git desktop_aura/desktop_window_tree_host_win.cc desktop_aura/desktop_window_tree_host_win.cc -index 270bd54..72748cf 100644 +index 48368f9..90ef876 100644 --- desktop_aura/desktop_window_tree_host_win.cc +++ desktop_aura/desktop_window_tree_host_win.cc @@ -131,7 +131,9 @@ void DesktopWindowTreeHostWin::Init(aura::Window* content_window, @@ -155,7 +155,7 @@ index 73e9e3e6..deb2cef 100644 }; diff --git widget.cc widget.cc -index 154d107..cf276b1 100644 +index e1fc508..e4fa275 100644 --- widget.cc +++ widget.cc @@ -119,6 +119,7 @@ Widget::InitParams::InitParams() @@ -166,7 +166,7 @@ index 154d107..cf276b1 100644 native_widget(NULL), desktop_window_tree_host(NULL), layer_type(ui::LAYER_TEXTURED), -@@ -142,6 +143,7 @@ Widget::InitParams::InitParams(Type type) +@@ -143,6 +144,7 @@ Widget::InitParams::InitParams(Type type) use_system_default_icon(false), show_state(ui::SHOW_STATE_DEFAULT), parent(NULL), @@ -174,7 +174,7 @@ index 154d107..cf276b1 100644 native_widget(NULL), desktop_window_tree_host(NULL), layer_type(ui::LAYER_TEXTURED), -@@ -316,7 +318,7 @@ void Widget::Init(const InitParams& in_params) { +@@ -318,7 +320,7 @@ void Widget::Init(const InitParams& in_params) { InitParams params = in_params; params.child |= (params.type == InitParams::TYPE_CONTROL); @@ -183,7 +183,7 @@ index 154d107..cf276b1 100644 if (params.opacity == views::Widget::InitParams::INFER_OPACITY && params.type != views::Widget::InitParams::TYPE_WINDOW && -@@ -379,7 +381,12 @@ void Widget::Init(const InitParams& in_params) { +@@ -381,7 +383,12 @@ void Widget::Init(const InitParams& in_params) { Minimize(); } else if (params.delegate) { SetContentsView(params.delegate->GetContentsView()); @@ -198,7 +198,7 @@ index 154d107..cf276b1 100644 // This must come after SetContentsView() or it might not be able to find // the correct NativeTheme (on Linux). See http://crbug.com/384492 diff --git widget.h widget.h -index 1342625..7fbc24c 100644 +index 301c0af..de63108 100644 --- widget.h +++ widget.h @@ -232,6 +232,7 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate,