diff --git a/CHROMIUM_BUILD_COMPATIBILITY.txt b/CHROMIUM_BUILD_COMPATIBILITY.txt index c94bc34fa..bc78cfd24 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/61.0.3163.79', + 'chromium_checkout': 'refs/tags/61.0.3163.91', } diff --git a/patch/patches/DEPS.patch b/patch/patches/DEPS.patch index de349e902..5f65ce12c 100644 --- a/patch/patches/DEPS.patch +++ b/patch/patches/DEPS.patch @@ -1,5 +1,5 @@ diff --git DEPS DEPS -index 64d6cfe9f8b3..37c1d8501077 100644 +index 0139fde15203..c4c89809dfad 100644 --- DEPS +++ DEPS @@ -644,20 +644,22 @@ hooks = [ diff --git a/patch/patches/content_1129_2015.patch b/patch/patches/content_1129_2015.patch index 513edb8ea..eb768b446 100644 --- a/patch/patches/content_1129_2015.patch +++ b/patch/patches/content_1129_2015.patch @@ -279,10 +279,10 @@ index 85b64dad4b90..e77f1bb5a1c2 100644 const std::string& mime_type, bool allow_wildcard, diff --git content/common/frame_messages.h content/common/frame_messages.h -index da541c99666f..5cd14c981e0f 100644 +index 80dbf7c11827..695fc9595fa2 100644 --- content/common/frame_messages.h +++ content/common/frame_messages.h -@@ -1325,8 +1325,9 @@ IPC_MESSAGE_ROUTED1(FrameHostMsg_PepperStopsPlayback, +@@ -1330,8 +1330,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. @@ -293,7 +293,7 @@ index da541c99666f..5cd14c981e0f 100644 url::Origin /* main_frame_origin */, std::vector /* plugins */) -@@ -1334,9 +1335,10 @@ IPC_SYNC_MESSAGE_CONTROL2_1(FrameHostMsg_GetPlugins, +@@ -1339,9 +1340,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. @@ -305,7 +305,7 @@ index da541c99666f..5cd14c981e0f 100644 url::Origin /* main_frame_origin */, std::string /* mime_type */, bool /* found */, -@@ -1717,9 +1719,9 @@ IPC_MESSAGE_ROUTED3(FrameHostMsg_FindMatchRects_Reply, +@@ -1722,9 +1724,9 @@ IPC_MESSAGE_ROUTED3(FrameHostMsg_FindMatchRects_Reply, IPC_MESSAGE_ROUTED2(FrameHostMsg_GetNearestFindResult_Reply, int /* nfr_request_id */, float /* distance */) @@ -429,10 +429,10 @@ index 48b932e878e3..80110f9efcbb 100644 virtual void FocusedNodeChanged(const blink::WebNode& node) {} diff --git content/renderer/render_frame_impl.cc content/renderer/render_frame_impl.cc -index 7b56c01f25af..497cd8e97a71 100644 +index ab1029fcda01..c1f89724da69 100644 --- content/renderer/render_frame_impl.cc +++ content/renderer/render_frame_impl.cc -@@ -2898,7 +2898,8 @@ blink::WebPlugin* RenderFrameImpl::CreatePlugin( +@@ -2899,7 +2899,8 @@ blink::WebPlugin* RenderFrameImpl::CreatePlugin( std::string mime_type; bool found = false; Send(new FrameHostMsg_GetPluginInfo( @@ -442,7 +442,7 @@ index 7b56c01f25af..497cd8e97a71 100644 params.mime_type.Utf8(), &found, &info, &mime_type)); if (!found) return nullptr; -@@ -3206,6 +3207,8 @@ void RenderFrameImpl::FrameDetached(blink::WebLocalFrame* frame, +@@ -3207,6 +3208,8 @@ void RenderFrameImpl::FrameDetached(blink::WebLocalFrame* frame, void RenderFrameImpl::FrameFocused() { Send(new FrameHostMsg_FrameFocused(routing_id_)); @@ -451,7 +451,7 @@ index 7b56c01f25af..497cd8e97a71 100644 } void RenderFrameImpl::WillCommitProvisionalLoad() { -@@ -5339,9 +5342,8 @@ WebNavigationPolicy RenderFrameImpl::DecidePolicyForNavigation( +@@ -5360,9 +5363,8 @@ WebNavigationPolicy RenderFrameImpl::DecidePolicyForNavigation( (!IsBrowserSideNavigationEnabled() || url != pending_navigation_params_->request_params.redirects[0])); @@ -463,7 +463,7 @@ index 7b56c01f25af..497cd8e97a71 100644 // The handlenavigation API is deprecated and will be removed once // crbug.com/325351 is resolved. if (GetContentClient()->renderer()->HandleNavigation( -@@ -5354,7 +5356,6 @@ WebNavigationPolicy RenderFrameImpl::DecidePolicyForNavigation( +@@ -5375,7 +5377,6 @@ WebNavigationPolicy RenderFrameImpl::DecidePolicyForNavigation( } return blink::kWebNavigationPolicyIgnore; } 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 bc2e28f44..a68417a43 100644 --- a/patch/patches/views_widget_180_1481_1565_1677_1749.patch +++ b/patch/patches/views_widget_180_1481_1565_1677_1749.patch @@ -374,10 +374,10 @@ index 63fcb9d611e8..7237ae60007f 100644 // the NativeWidget may specify a default size. If the parent is specified, // |bounds| is in the parent's coordinate system. If the parent is not diff --git ui/views/win/hwnd_message_handler.cc ui/views/win/hwnd_message_handler.cc -index d74ed45367cb..d081b8172d54 100644 +index d8086d862d59..5c9c498b1052 100644 --- ui/views/win/hwnd_message_handler.cc +++ ui/views/win/hwnd_message_handler.cc -@@ -2655,8 +2655,12 @@ LRESULT HWNDMessageHandler::HandleMouseEventInternal(UINT message, +@@ -2660,8 +2660,12 @@ LRESULT HWNDMessageHandler::HandleMouseEventInternal(UINT message, active_mouse_tracking_flags_ = 0; } else if (event.type() == ui::ET_MOUSEWHEEL) { // Reroute the mouse wheel to the window under the pointer if applicable. diff --git a/patch/patches/web_contents_1257_1565.patch b/patch/patches/web_contents_1257_1565.patch index c8b663a37..f84efc09e 100644 --- a/patch/patches/web_contents_1257_1565.patch +++ b/patch/patches/web_contents_1257_1565.patch @@ -1,5 +1,5 @@ diff --git content/browser/web_contents/web_contents_impl.cc content/browser/web_contents/web_contents_impl.cc -index 7e017d13be52..e9b22ba5ab86 100644 +index d927e85156ef..99f940eca2a2 100644 --- content/browser/web_contents/web_contents_impl.cc +++ content/browser/web_contents/web_contents_impl.cc @@ -1699,6 +1699,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) { @@ -23,7 +23,7 @@ index 7e017d13be52..e9b22ba5ab86 100644 if (browser_plugin_guest_ && !GuestMode::IsCrossProcessFrameGuest(this)) { view_.reset(new WebContentsViewGuest(this, browser_plugin_guest_.get(), -@@ -2273,6 +2280,15 @@ void WebContentsImpl::CreateNewWindow( +@@ -2280,6 +2287,15 @@ void WebContentsImpl::CreateNewWindow( create_params.renderer_initiated_creation = main_frame_route_id != MSG_ROUTING_NONE; @@ -39,7 +39,7 @@ index 7e017d13be52..e9b22ba5ab86 100644 WebContentsImpl* new_contents = NULL; if (!is_guest) { create_params.context = view_->GetNativeView(); -@@ -2302,7 +2318,7 @@ void WebContentsImpl::CreateNewWindow( +@@ -2309,7 +2325,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 7e017d13be52..e9b22ba5ab86 100644 } // Save the created window associated with the route so we can show it // later. -@@ -5380,7 +5396,7 @@ InterstitialPageImpl* WebContentsImpl::GetInterstitialForRenderManager() { +@@ -5387,7 +5403,7 @@ InterstitialPageImpl* WebContentsImpl::GetInterstitialForRenderManager() { void WebContentsImpl::CreateRenderWidgetHostViewForRenderManager( RenderViewHost* render_view_host) { RenderWidgetHostViewBase* rwh_view =