Update to Chromium revision 088f14a0 (#373530)

- Building on Windows now requires the Windows 10.0.10586 SDK. - Remove CefParseCSSColor which was implemented using Blink code in the browser process. This is longer advisable now that the Oilpan GC is enabled. - Avoid potential renderer process crashes by disabling script actions on the CefV8Context passed to CefRenderProcessHandler::OnContextReleased.
2025-06-05 21:39:12 +02:00 · 2016-02-04 19:49:19 -05:00
parent 70ab57ab23
commit f7aa98fe69
78 changed files with 470 additions and 500 deletions
--- a/patch/patches/browser_frame_host_guest_1687.patch
+++ b/patch/patches/browser_frame_host_guest_1687.patch
@@ -1,8 +1,8 @@
 diff --git render_widget_host_view_guest.cc render_widget_host_view_guest.cc
-index 6d4a181..952a058 100644
+index a080567..8da4190 100644
 --- render_widget_host_view_guest.cc
 +++ render_widget_host_view_guest.cc
-@@ -218,6 +218,9 @@ void RenderWidgetHostViewGuest::Destroy() {
+@@ -220,6 +220,9 @@ void RenderWidgetHostViewGuest::Destroy() {
 }
 
 gfx::Size RenderWidgetHostViewGuest::GetPhysicalBackingSize() const {
--- a/patch/patches/browser_plugin_guest_1565.patch
+++ b/patch/patches/browser_plugin_guest_1565.patch
@@ -1,5 +1,5 @@
 diff --git browser/browser_plugin/browser_plugin_guest.cc browser/browser_plugin/browser_plugin_guest.cc
-index 33262a8..5da1220 100644
+index 1855e5d..4e0cd1d 100644
 --- browser/browser_plugin/browser_plugin_guest.cc
 +++ browser/browser_plugin/browser_plugin_guest.cc
@@ -27,7 +27,7 @@
@@ -36,10 +36,10 @@ index 33262a8..5da1220 100644
   }
 
   RendererPreferences* renderer_prefs =
-@@ -791,11 +790,10 @@ void BrowserPluginGuest::OnWillAttachComplete(
-     static_cast<RenderViewHostImpl*>(GetWebContents()->GetRenderViewHost())
+@@ -792,11 +791,10 @@ void BrowserPluginGuest::OnWillAttachComplete(
         ->GetWidget()
         ->Init();
+     GetWebContents()->GetMainFrame()->Init();
 -    WebContentsViewGuest* web_contents_view =
 -        static_cast<WebContentsViewGuest*>(GetWebContents()->GetView());
     if (!web_contents()->GetRenderViewHost()->GetWidget()->GetView()) {
--- a/patch/patches/browser_web_contents_1257.patch
+++ b/patch/patches/browser_web_contents_1257.patch
@@ -1,8 +1,8 @@
 diff --git web_contents_impl.cc web_contents_impl.cc
-index ccadfb2..b70b8e4 100644
+index 2af90ae..7580a73 100644
 --- web_contents_impl.cc
 +++ web_contents_impl.cc
-@@ -1388,32 +1388,40 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
+@@ -1382,32 +1382,40 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
                            main_frame_widget_routing_id);
   frame_tree_.root()->SetFrameName(params.main_frame_name);
 
@@ -62,7 +62,7 @@ index ccadfb2..b70b8e4 100644
   CHECK(render_view_host_delegate_view_);
   CHECK(view_.get());
 
-@@ -1835,11 +1843,14 @@ void WebContentsImpl::CreateNewWindow(
+@@ -1839,11 +1847,14 @@ void WebContentsImpl::CreateNewWindow(
       static_cast<SessionStorageNamespaceImpl*>(session_storage_namespace);
   CHECK(session_storage_namespace_impl->IsFromContext(dom_storage_context));
 
@@ -78,7 +78,7 @@ index ccadfb2..b70b8e4 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
-@@ -1860,6 +1871,8 @@ void WebContentsImpl::CreateNewWindow(
+@@ -1867,6 +1878,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;
--- a/patch/patches/build.patch
+++ b/patch/patches/build.patch
@@ -1,5 +1,5 @@
 diff --git common.gypi common.gypi
-index 514b129..036fe51 100644
+index 846dc3a..700284e 100644
 --- common.gypi
 +++ common.gypi
@@ -9,6 +9,9 @@
--- a/patch/patches/chrome_browser_1257.patch
+++ b/patch/patches/chrome_browser_1257.patch
@@ -1,8 +1,8 @@
 diff --git ui/browser.cc ui/browser.cc
-index 717381d..35f791b 100644
+index 8ceee96..da77140 100644
 --- ui/browser.cc
 +++ ui/browser.cc
-@@ -1707,7 +1707,9 @@ bool Browser::ShouldCreateWebContents(
+@@ -1726,7 +1726,9 @@ bool Browser::ShouldCreateWebContents(
     const std::string& frame_name,
     const GURL& target_url,
     const std::string& partition_id,
@@ -14,10 +14,10 @@ index 717381d..35f791b 100644
     // If a BackgroundContents is created, suppress the normal WebContents.
     return !MaybeCreateBackgroundContents(
 diff --git ui/browser.h ui/browser.h
-index 13ec6b4..6e8fffa 100644
+index 37d23b3..37c9ea9 100644
 --- ui/browser.h
 +++ ui/browser.h
-@@ -599,7 +599,9 @@ class Browser : public TabStripModelObserver,
+@@ -600,7 +600,9 @@ class Browser : public TabStripModelObserver,
       const std::string& frame_name,
       const GURL& target_url,
       const std::string& partition_id,
--- 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 874debf..ba26bdf 100644
+index eccd9dc..d0908c6 100644
 --- content/browser/compositor/gpu_process_transport_factory.cc
 +++ content/browser/compositor/gpu_process_transport_factory.cc
-@@ -137,6 +137,13 @@ GpuProcessTransportFactory::CreateOffscreenCommandBufferContext() {
+@@ -132,6 +132,13 @@ GpuProcessTransportFactory::CreateOffscreenCommandBufferContext() {
 scoped_ptr<cc::SoftwareOutputDevice>
 GpuProcessTransportFactory::CreateSoftwareOutputDevice(
     ui::Compositor* compositor) {
--- a/patch/patches/content_nav_1129.patch
+++ b/patch/patches/content_nav_1129.patch
@@ -39,10 +39,10 @@ index 45686b5..18548a0 100644
   // 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
 diff --git renderer/render_frame_impl.cc renderer/render_frame_impl.cc
-index 9b199d3..1a8b6fa 100644
+index 0fc35cb..caed853 100644
 --- renderer/render_frame_impl.cc
 +++ renderer/render_frame_impl.cc
-@@ -4684,7 +4684,6 @@ WebNavigationPolicy RenderFrameImpl::decidePolicyForNavigation(
+@@ -4750,7 +4750,6 @@ WebNavigationPolicy RenderFrameImpl::decidePolicyForNavigation(
       (pending_navigation_params_ &&
        !pending_navigation_params_->request_params.redirects.empty());
 
@@ -50,7 +50,7 @@ index 9b199d3..1a8b6fa 100644
   // The handlenavigation API is deprecated and will be removed once
   // crbug.com/325351 is resolved.
   if (info.urlRequest.url() != GURL(kSwappedOutURL) &&
-@@ -4694,7 +4693,6 @@ WebNavigationPolicy RenderFrameImpl::decidePolicyForNavigation(
+@@ -4760,7 +4759,6 @@ WebNavigationPolicy RenderFrameImpl::decidePolicyForNavigation(
           is_redirect)) {
     return blink::WebNavigationPolicyIgnore;
   }
--- a/patch/patches/extensions_1257.patch
+++ b/patch/patches/extensions_1257.patch
@@ -1,5 +1,5 @@
 diff --git browser/guest_view/extension_options/extension_options_guest.cc browser/guest_view/extension_options/extension_options_guest.cc
-index f594ade..f71e7ed 100644
+index a3d8c7c..1ad97bc 100644
 --- browser/guest_view/extension_options/extension_options_guest.cc
 +++ browser/guest_view/extension_options/extension_options_guest.cc
@@ -202,7 +202,9 @@ bool ExtensionOptionsGuest::ShouldCreateWebContents(
--- a/patch/patches/font_family_cache_1501.patch
+++ b/patch/patches/font_family_cache_1501.patch
@@ -1,5 +1,5 @@
 diff --git font_family_cache.h font_family_cache.h
-index 306cbf0..6ca443c 100644
+index 743448d..0a9f350 100644
 --- font_family_cache.h
 +++ font_family_cache.h
@@ -20,6 +20,8 @@ class Profile;
--- a/patch/patches/gritsettings.patch
+++ b/patch/patches/gritsettings.patch
@@ -1,5 +1,5 @@
 diff --git resource_ids resource_ids
-index c1f41e0..5ef46f2 100644
+index 2943776..6d4b898 100644
 --- resource_ids
 +++ resource_ids
@@ -14,6 +14,12 @@
--- a/patch/patches/gyp_331.patch
+++ b/patch/patches/gyp_331.patch
@@ -1,8 +1,8 @@
 diff --git gyp/generator/ninja.py gyp/generator/ninja.py
-index d8a45c7..3dd5518 100644
+index 552b2f8..3d61233 100644
 --- gyp/generator/ninja.py
 +++ gyp/generator/ninja.py
-@@ -745,7 +745,16 @@ class NinjaWriter(object):
+@@ -747,7 +747,16 @@ class NinjaWriter(object):
       for path in copy['files']:
         # Normalize the path so trailing slashes don't confuse us.
         path = os.path.normpath(path)
--- a/patch/patches/hwnd_message_handler_1481.patch
+++ b/patch/patches/hwnd_message_handler_1481.patch
@@ -1,8 +1,8 @@
 diff --git hwnd_message_handler.cc hwnd_message_handler.cc
-index 0cacffe..847ce2b 100644
+index f632827..b6c912c 100644
 --- hwnd_message_handler.cc
 +++ hwnd_message_handler.cc
-@@ -2387,8 +2387,12 @@ LRESULT HWNDMessageHandler::HandleMouseEventInternal(UINT message,
+@@ -2382,8 +2382,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.
--- 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 56bbac1..3265c64 100644
+index 6ac7e6f..ad372ce 100644
 --- input_method_win.cc
 +++ input_method_win.cc
-@@ -588,8 +588,9 @@ bool InputMethodWin::IsWindowFocused(const TextInputClient* client) const {
+@@ -614,8 +614,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.
--- a/patch/patches/message_loop_443.patch
+++ b/patch/patches/message_loop_443.patch
@@ -1,5 +1,5 @@
 diff --git message_loop.cc message_loop.cc
-index e84765a..560bd39 100644
+index 88f75e9..7abb471 100644
 --- message_loop.cc
 +++ message_loop.cc
@@ -139,12 +139,6 @@ MessageLoop::~MessageLoop() {
--- a/patch/patches/net_filter_515.patch
+++ b/patch/patches/net_filter_515.patch
@@ -45,10 +45,10 @@ index e9df3db..768b7fc 100644
   friend class GZipUnitTest;
   friend class SdchFilterChainingTest;
 diff --git url_request/url_request_job.cc url_request/url_request_job.cc
-index 55a4f51..937f163 100644
+index e46d3f1..0c0430f 100644
 --- url_request/url_request_job.cc
 +++ url_request/url_request_job.cc
-@@ -447,6 +447,9 @@ void URLRequestJob::NotifyHeadersComplete() {
+@@ -448,6 +448,9 @@ void URLRequestJob::NotifyHeadersComplete() {
   if (request_->status().is_success())
     filter_.reset(SetupFilter());
 
--- a/patch/patches/pdfium_print_549365.patch
+++ b/patch/patches/pdfium_print_549365.patch
@@ -1,5 +1,5 @@
 diff --git fpdfsdk/src/fpdfview.cpp fpdfsdk/src/fpdfview.cpp
-index a6c1420..88c1b97 100644
+index ba64709..02e1391 100644
 --- fpdfsdk/src/fpdfview.cpp
 +++ fpdfsdk/src/fpdfview.cpp
@@ -14,6 +14,7 @@
--- a/patch/patches/prefs_content_1161.patch
+++ b/patch/patches/prefs_content_1161.patch
@@ -1,8 +1,8 @@
 diff --git public/common/common_param_traits_macros.h public/common/common_param_traits_macros.h
-index a9811c4..a43f9d1 100644
+index 45a9516..419f17e 100644
 --- public/common/common_param_traits_macros.h
 +++ public/common/common_param_traits_macros.h
-@@ -193,6 +193,7 @@ IPC_STRUCT_TRAITS_BEGIN(content::WebPreferences)
+@@ -194,6 +194,7 @@ IPC_STRUCT_TRAITS_BEGIN(content::WebPreferences)
   IPC_STRUCT_TRAITS_MEMBER(main_frame_resizes_are_orientation_changes)
   IPC_STRUCT_TRAITS_MEMBER(initialize_at_minimum_page_scale)
   IPC_STRUCT_TRAITS_MEMBER(smart_insert_delete_enabled)
@@ -11,10 +11,10 @@ index a9811c4..a43f9d1 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 4a83a70..98781c0 100644
+index 62af1ce..23e31de 100644
 --- public/common/web_preferences.cc
 +++ public/common/web_preferences.cc
-@@ -171,6 +171,7 @@ WebPreferences::WebPreferences()
+@@ -172,6 +172,7 @@ WebPreferences::WebPreferences()
       pinch_overlay_scrollbar_thickness(0),
       use_solid_color_scrollbars(false),
       navigate_on_drag_drop(true),
@@ -23,10 +23,10 @@ index 4a83a70..98781c0 100644
       cookie_enabled(true),
       pepper_accelerated_video_decode_enabled(false),
 diff --git public/common/web_preferences.h public/common/web_preferences.h
-index de5a3c5..afdf03f 100644
+index 7d6ca7d..ba38861 100644
 --- public/common/web_preferences.h
 +++ public/common/web_preferences.h
-@@ -172,6 +172,7 @@ struct CONTENT_EXPORT WebPreferences {
+@@ -174,6 +174,7 @@ struct CONTENT_EXPORT WebPreferences {
   int pinch_overlay_scrollbar_thickness;
   bool use_solid_color_scrollbars;
   bool navigate_on_drag_drop;
@@ -35,10 +35,10 @@ index de5a3c5..afdf03f 100644
 
   // This flags corresponds to a Page's Settings' setCookieEnabled state. It
 diff --git renderer/render_view_impl.cc renderer/render_view_impl.cc
-index 8e6b887..77ef5ad 100644
+index 36d226c..ce8fd74 100644
 --- renderer/render_view_impl.cc
 +++ renderer/render_view_impl.cc
-@@ -938,6 +938,8 @@ void RenderView::ApplyWebPreferences(const WebPreferences& prefs,
+@@ -953,6 +953,8 @@ void RenderView::ApplyWebPreferences(const WebPreferences& prefs,
   settings->setCookieEnabled(prefs.cookie_enabled);
   settings->setNavigateOnDragDrop(prefs.navigate_on_drag_drop);
 
--- a/patch/patches/prefs_tab_helper_1680.patch
+++ b/patch/patches/prefs_tab_helper_1680.patch
@@ -1,5 +1,5 @@
 diff --git prefs_tab_helper.cc prefs_tab_helper.cc
-index ee406db..fc86170 100644
+index 36d6fe9..a875d1e 100644
 --- prefs_tab_helper.cc
 +++ prefs_tab_helper.cc
@@ -12,7 +12,7 @@
@@ -9,8 +9,8 @@ index ee406db..fc86170 100644
 -#include "base/memory/singleton.h"
 +#include "base/lazy_instance.h"
 #include "base/metrics/field_trial.h"
- #include "base/prefs/overlay_user_pref_store.h"
- #include "base/prefs/pref_change_registrar.h"
+ #include "base/strings/string_number_conversions.h"
+ #include "base/strings/string_util.h"
@@ -431,12 +431,10 @@ class PrefWatcherFactory : public BrowserContextKeyedServiceFactory {
         GetInstance()->GetServiceForBrowserContext(profile, true));
   }
--- a/patch/patches/print_header_footer_1478_1565.patch
+++ b/patch/patches/print_header_footer_1478_1565.patch
@@ -16,7 +16,7 @@ index c3469fc..9fc71ac 100644
 }
 -#endif  // defined(ENABLE_PRINT_PREVIEW)
 diff --git printing/common/print_messages.h printing/common/print_messages.h
-index 372097f..ae8a227 100644
+index 6060a1c..d051297 100644
 --- printing/common/print_messages.h
 +++ printing/common/print_messages.h
@@ -70,7 +70,6 @@ struct PrintMsg_PrintPages_Params {
@@ -106,7 +106,7 @@ index 372097f..ae8a227 100644
 
 // Messages sent from the renderer to the browser.
 
-@@ -423,7 +413,6 @@ IPC_MESSAGE_CONTROL2(PrintHostMsg_TempFileForPrintingWritten,
+@@ -415,7 +405,6 @@ IPC_MESSAGE_CONTROL2(PrintHostMsg_TempFileForPrintingWritten,
                      int /* fd in browser */)  // Used only by Chrome OS.
 #endif  // defined(OS_ANDROID)
 
@@ -114,7 +114,7 @@ index 372097f..ae8a227 100644
 // Asks the browser to do print preview.
 IPC_MESSAGE_ROUTED1(PrintHostMsg_RequestPrintPreview,
                     PrintHostMsg_RequestPrintPreview_Params /* params */)
-@@ -457,7 +446,6 @@ IPC_SYNC_MESSAGE_ROUTED2_1(PrintHostMsg_CheckForCancel,
+@@ -449,7 +438,6 @@ IPC_SYNC_MESSAGE_ROUTED2_1(PrintHostMsg_CheckForCancel,
 // The memory handle in this message is already valid in the browser process.
 IPC_MESSAGE_ROUTED1(PrintHostMsg_MetafileReadyForPrinting,
                     PrintHostMsg_DidPreviewDocument_Params /* params */)
@@ -122,7 +122,7 @@ index 372097f..ae8a227 100644
 
 // This is sent when there are invalid printer settings.
 IPC_MESSAGE_ROUTED0(PrintHostMsg_ShowInvalidPrinterSettingsError)
-@@ -466,7 +454,6 @@ IPC_MESSAGE_ROUTED0(PrintHostMsg_ShowInvalidPrinterSettingsError)
+@@ -458,7 +446,6 @@ IPC_MESSAGE_ROUTED0(PrintHostMsg_ShowInvalidPrinterSettingsError)
 IPC_MESSAGE_ROUTED1(PrintHostMsg_PrintingFailed,
                     int /* document cookie */)
 
@@ -130,16 +130,16 @@ index 372097f..ae8a227 100644
 // Tell the browser print preview failed.
 IPC_MESSAGE_ROUTED1(PrintHostMsg_PrintPreviewFailed,
                     int /* document cookie */)
-@@ -493,4 +480,3 @@ IPC_MESSAGE_ROUTED1(PrintHostMsg_ShowScriptedPrintPreview,
+@@ -485,4 +472,3 @@ IPC_MESSAGE_ROUTED1(PrintHostMsg_ShowScriptedPrintPreview,
 // Notify the browser to set print presets based on source PDF document.
 IPC_MESSAGE_ROUTED1(PrintHostMsg_SetOptionsFromDocument,
                     PrintHostMsg_SetOptionsFromDocument_Params /* params */)
 -#endif  // defined(ENABLE_PRINT_PREVIEW)
 diff --git printing/renderer/print_web_view_helper.cc printing/renderer/print_web_view_helper.cc
-index ff97954..c93dabf 100644
+index 6a8f1c3..f66469e 100644
 --- printing/renderer/print_web_view_helper.cc
 +++ printing/renderer/print_web_view_helper.cc
-@@ -80,6 +80,9 @@ const double kMinDpi = 1.0;
+@@ -81,6 +81,9 @@ const double kMinDpi = 1.0;
 
 #if defined(ENABLE_PRINT_PREVIEW)
 bool g_is_preview_enabled = true;
@@ -149,7 +149,7 @@ index ff97954..c93dabf 100644
 
 const char kPageLoadScriptFormat[] =
     "document.open(); document.write(%s); document.close();";
-@@ -94,9 +97,6 @@ void ExecuteScript(blink::WebFrame* frame,
+@@ -95,9 +98,6 @@ void ExecuteScript(blink::WebFrame* frame,
   std::string script = base::StringPrintf(script_format, json.c_str());
   frame->executeScript(blink::WebString(base::UTF8ToUTF16(script)));
 }
@@ -159,7 +159,7 @@ index ff97954..c93dabf 100644
 
 int GetDPI(const PrintMsg_Print_Params* print_params) {
 #if defined(OS_MACOSX)
-@@ -306,7 +306,6 @@ bool PrintingNodeOrPdfFrame(const blink::WebLocalFrame* frame,
+@@ -307,7 +307,6 @@ bool PrintingNodeOrPdfFrame(const blink::WebLocalFrame* frame,
   return plugin && plugin->supportsPaginatedPrint();
 }
 
@@ -167,7 +167,7 @@ index ff97954..c93dabf 100644
 // Returns true if the current destination printer is PRINT_TO_PDF.
 bool IsPrintToPdfRequested(const base::DictionaryValue& job_settings) {
   bool print_to_pdf = false;
-@@ -328,7 +327,6 @@ bool PrintingFrameHasPageSizeStyle(blink::WebFrame* frame,
+@@ -329,7 +328,6 @@ bool PrintingFrameHasPageSizeStyle(blink::WebFrame* frame,
   }
   return frame_has_custom_page_size_style;
 }
@@ -175,7 +175,7 @@ index ff97954..c93dabf 100644
 
 // Disable scaling when either:
 // - The PDF specifies disabling scaling.
-@@ -375,7 +373,6 @@ MarginType GetMarginsForPdf(blink::WebLocalFrame* frame,
+@@ -376,7 +374,6 @@ MarginType GetMarginsForPdf(blink::WebLocalFrame* frame,
 }
 #endif
 
@@ -183,7 +183,7 @@ index ff97954..c93dabf 100644
 bool FitToPageEnabled(const base::DictionaryValue& job_settings) {
   bool fit_to_paper_size = false;
   if (!job_settings.GetBoolean(kSettingFitToPageEnabled, &fit_to_paper_size)) {
-@@ -417,7 +414,6 @@ blink::WebPrintScalingOption GetPrintScalingOption(
+@@ -418,7 +415,6 @@ blink::WebPrintScalingOption GetPrintScalingOption(
   }
   return blink::WebPrintScalingOptionFitToPrintableArea;
 }
@@ -191,7 +191,7 @@ index ff97954..c93dabf 100644
 
 PrintMsg_Print_Params CalculatePrintParamsForCss(
     blink::WebFrame* frame,
-@@ -501,7 +497,6 @@ blink::WebView* FrameReference::view() {
+@@ -502,7 +498,6 @@ blink::WebView* FrameReference::view() {
   return view_;
 }
 
@@ -199,7 +199,7 @@ index ff97954..c93dabf 100644
 // static - Not anonymous so that platform implementations can use it.
 void PrintWebViewHelper::PrintHeaderAndFooter(
     blink::WebCanvas* canvas,
-@@ -557,7 +552,6 @@ void PrintWebViewHelper::PrintHeaderAndFooter(
+@@ -558,7 +553,6 @@ void PrintWebViewHelper::PrintHeaderAndFooter(
   web_view->close();
   frame->close();
 }
@@ -207,7 +207,7 @@ index ff97954..c93dabf 100644
 
 // static - Not anonymous so that platform implementations can use it.
 float PrintWebViewHelper::RenderPageContent(blink::WebFrame* frame,
-@@ -830,6 +824,7 @@ PrintWebViewHelper::PrintWebViewHelper(content::RenderView* render_view,
+@@ -831,6 +825,7 @@ PrintWebViewHelper::PrintWebViewHelper(content::RenderView* render_view,
       print_for_preview_(false),
       delegate_(std::move(delegate)),
       print_node_in_progress_(false),
@@ -215,7 +215,7 @@ index ff97954..c93dabf 100644
       is_loading_(false),
       is_scripted_preview_delayed_(false),
       ipc_nesting_level_(0),
-@@ -888,10 +883,8 @@ void PrintWebViewHelper::PrintPage(blink::WebLocalFrame* frame,
+@@ -889,10 +884,8 @@ void PrintWebViewHelper::PrintPage(blink::WebLocalFrame* frame,
     return;
 
   if (g_is_preview_enabled) {
@@ -226,7 +226,7 @@ index ff97954..c93dabf 100644
   } else {
 #if defined(ENABLE_BASIC_PRINTING)
     Print(frame, blink::WebNode(), true);
-@@ -915,14 +908,10 @@ bool PrintWebViewHelper::OnMessageReceived(const IPC::Message& message) {
+@@ -916,14 +909,10 @@ bool PrintWebViewHelper::OnMessageReceived(const IPC::Message& message) {
     IPC_MESSAGE_HANDLER(PrintMsg_PrintPages, OnPrintPages)
     IPC_MESSAGE_HANDLER(PrintMsg_PrintForSystemDialog, OnPrintForSystemDialog)
 #endif  // defined(ENABLE_BASIC_PRINTING)
@@ -241,7 +241,7 @@ index ff97954..c93dabf 100644
     IPC_MESSAGE_HANDLER(PrintMsg_SetScriptedPrintingBlocked,
                         SetScriptedPrintBlocked)
     IPC_MESSAGE_UNHANDLED(handled = false)
-@@ -974,7 +963,6 @@ void PrintWebViewHelper::OnPrintForSystemDialog() {
+@@ -975,7 +964,6 @@ void PrintWebViewHelper::OnPrintForSystemDialog() {
 }
 #endif  // defined(ENABLE_BASIC_PRINTING)
 
@@ -249,7 +249,7 @@ index ff97954..c93dabf 100644
 void PrintWebViewHelper::OnPrintForPrintPreview(
     const base::DictionaryValue& job_settings) {
   CHECK_LE(ipc_nesting_level_, 1);
-@@ -1039,7 +1027,6 @@ void PrintWebViewHelper::OnPrintForPrintPreview(
+@@ -1040,7 +1028,6 @@ void PrintWebViewHelper::OnPrintForPrintPreview(
     DidFinishPrinting(FAIL_PRINT);
   }
 }
@@ -257,7 +257,7 @@ index ff97954..c93dabf 100644
 
 void PrintWebViewHelper::GetPageSizeAndContentAreaFromPageLayout(
     const PageSizeMargins& page_layout_in_points,
-@@ -1064,7 +1051,6 @@ void PrintWebViewHelper::UpdateFrameMarginsCssInfo(
+@@ -1065,7 +1052,6 @@ void PrintWebViewHelper::UpdateFrameMarginsCssInfo(
   ignore_css_margins_ = (margins_type != DEFAULT_MARGINS);
 }
 
@@ -265,7 +265,7 @@ index ff97954..c93dabf 100644
 void PrintWebViewHelper::OnPrintPreview(const base::DictionaryValue& settings) {
   if (ipc_nesting_level_ > 1)
     return;
-@@ -1225,7 +1211,7 @@ bool PrintWebViewHelper::CreatePreviewDocument() {
+@@ -1226,7 +1212,7 @@ bool PrintWebViewHelper::CreatePreviewDocument() {
   return true;
 }
 
@@ -274,7 +274,7 @@ index ff97954..c93dabf 100644
 bool PrintWebViewHelper::RenderPreviewPage(
     int page_number,
     const PrintMsg_Print_Params& print_params) {
-@@ -1254,7 +1240,7 @@ bool PrintWebViewHelper::RenderPreviewPage(
+@@ -1255,7 +1241,7 @@ bool PrintWebViewHelper::RenderPreviewPage(
   }
   return PreviewPageRendered(page_number, draft_metafile.get());
 }
@@ -283,7 +283,7 @@ index ff97954..c93dabf 100644
 
 bool PrintWebViewHelper::FinalizePrintReadyDocument() {
   DCHECK(!is_print_ready_metafile_sent_);
-@@ -1284,7 +1270,6 @@ bool PrintWebViewHelper::FinalizePrintReadyDocument() {
+@@ -1285,7 +1271,6 @@ bool PrintWebViewHelper::FinalizePrintReadyDocument() {
   Send(new PrintHostMsg_MetafileReadyForPrinting(routing_id(), preview_params));
   return true;
 }
@@ -291,7 +291,7 @@ index ff97954..c93dabf 100644
 
 void PrintWebViewHelper::OnPrintingDone(bool success) {
   if (ipc_nesting_level_ > 1)
-@@ -1299,7 +1284,6 @@ void PrintWebViewHelper::SetScriptedPrintBlocked(bool blocked) {
+@@ -1300,7 +1285,6 @@ void PrintWebViewHelper::SetScriptedPrintBlocked(bool blocked) {
   is_scripted_printing_blocked_ = blocked;
 }
 
@@ -299,7 +299,7 @@ index ff97954..c93dabf 100644
 void PrintWebViewHelper::OnInitiatePrintPreview(bool selection_only) {
   if (ipc_nesting_level_ > 1)
     return;
-@@ -1310,7 +1294,9 @@ void PrintWebViewHelper::OnInitiatePrintPreview(bool selection_only) {
+@@ -1311,7 +1295,9 @@ void PrintWebViewHelper::OnInitiatePrintPreview(bool selection_only) {
   // that instead.
   auto plugin = delegate_->GetPdfElement(frame);
   if (!plugin.isNull()) {
@@ -309,7 +309,7 @@ index ff97954..c93dabf 100644
     return;
   }
   print_preview_context_.InitWithFrame(frame);
-@@ -1318,7 +1304,6 @@ void PrintWebViewHelper::OnInitiatePrintPreview(bool selection_only) {
+@@ -1319,7 +1305,6 @@ void PrintWebViewHelper::OnInitiatePrintPreview(bool selection_only) {
                           ? PRINT_PREVIEW_USER_INITIATED_SELECTION
                           : PRINT_PREVIEW_USER_INITIATED_ENTIRE_FRAME);
 }
@@ -317,7 +317,7 @@ index ff97954..c93dabf 100644
 
 bool PrintWebViewHelper::IsPrintingEnabled() {
   bool result = false;
-@@ -1344,11 +1329,9 @@ void PrintWebViewHelper::PrintNode(const blink::WebNode& node) {
+@@ -1345,11 +1330,9 @@ void PrintWebViewHelper::PrintNode(const blink::WebNode& node) {
 
   // Make a copy of the node, in case RenderView::OnContextMenuClosed resets
   // its |context_menu_node_|.
@@ -330,7 +330,7 @@ index ff97954..c93dabf 100644
   } else {
 #if defined(ENABLE_BASIC_PRINTING)
     blink::WebNode duplicate_node(node);
-@@ -1414,7 +1397,6 @@ void PrintWebViewHelper::DidFinishPrinting(PrintingResult result) {
+@@ -1415,7 +1398,6 @@ void PrintWebViewHelper::DidFinishPrinting(PrintingResult result) {
       }
       break;
 
@@ -338,7 +338,7 @@ index ff97954..c93dabf 100644
     case FAIL_PREVIEW:
       int cookie =
           print_pages_params_ ? print_pages_params_->params.document_cookie : 0;
-@@ -1426,7 +1408,6 @@ void PrintWebViewHelper::DidFinishPrinting(PrintingResult result) {
+@@ -1427,7 +1409,6 @@ void PrintWebViewHelper::DidFinishPrinting(PrintingResult result) {
       }
       print_preview_context_.Failed(notify_browser_of_print_failure_);
       break;
@@ -346,7 +346,7 @@ index ff97954..c93dabf 100644
   }
   prep_frame_view_.reset();
   print_pages_params_.reset();
-@@ -1558,7 +1539,6 @@ bool PrintWebViewHelper::CalculateNumberOfPages(blink::WebLocalFrame* frame,
+@@ -1559,7 +1540,6 @@ bool PrintWebViewHelper::CalculateNumberOfPages(blink::WebLocalFrame* frame,
   return true;
 }
 
@@ -354,7 +354,7 @@ index ff97954..c93dabf 100644
 bool PrintWebViewHelper::SetOptionsFromPdfDocument(
     PrintHostMsg_SetOptionsFromDocument_Params* options) {
   blink::WebLocalFrame* source_frame = print_preview_context_.source_frame();
-@@ -1667,7 +1647,6 @@ bool PrintWebViewHelper::UpdatePrintSettings(
+@@ -1668,7 +1648,6 @@ bool PrintWebViewHelper::UpdatePrintSettings(
 
   return true;
 }
@@ -362,7 +362,7 @@ index ff97954..c93dabf 100644
 
 #if defined(ENABLE_BASIC_PRINTING)
 bool PrintWebViewHelper::GetPrintSettingsFromUser(blink::WebLocalFrame* frame,
-@@ -1759,11 +1738,14 @@ void PrintWebViewHelper::PrintPageInternal(
+@@ -1760,11 +1739,14 @@ void PrintWebViewHelper::PrintPageInternal(
   gfx::Rect canvas_area =
       params.params.display_header_footer ? gfx::Rect(page_size) : content_area;
 
@@ -378,7 +378,7 @@ index ff97954..c93dabf 100644
   // TODO(thestig) GetVectorCanvasForNewPage() and RenderPageContent() take a
   // different scale factor vs Windows. Figure out why and combine the two.
 #if defined(OS_WIN)
-@@ -1779,14 +1761,12 @@ void PrintWebViewHelper::PrintPageInternal(
+@@ -1780,14 +1762,12 @@ void PrintWebViewHelper::PrintPageInternal(
 
   MetafileSkiaWrapper::SetMetafileOnCanvas(*canvas, metafile);
 
@@ -393,7 +393,7 @@ index ff97954..c93dabf 100644
 
   float webkit_scale_factor =
       RenderPageContent(frame, params.page_number, canvas_area, content_area,
-@@ -1841,7 +1821,6 @@ bool PrintWebViewHelper::CopyMetafileDataToSharedMem(
+@@ -1836,7 +1816,6 @@ bool PrintWebViewHelper::CopyMetafileDataToSharedMem(
 #endif  // defined(OS_WIN)
 }
 
@@ -401,7 +401,7 @@ index ff97954..c93dabf 100644
 void PrintWebViewHelper::ShowScriptedPrintPreview() {
   if (is_scripted_preview_delayed_) {
     is_scripted_preview_delayed_ = false;
-@@ -1969,7 +1948,6 @@ bool PrintWebViewHelper::PreviewPageRendered(int page_number,
+@@ -1964,7 +1943,6 @@ bool PrintWebViewHelper::PreviewPageRendered(int page_number,
   Send(new PrintHostMsg_DidPreviewPage(routing_id(), preview_page_params));
   return true;
 }
@@ -507,7 +507,7 @@ index ca10384..7aacfbc 100644
   bool is_loading_;
   bool is_scripted_preview_delayed_;
 diff --git printing/renderer/print_web_view_helper_mac.mm printing/renderer/print_web_view_helper_mac.mm
-index e94f21e..e148860 100644
+index 08a1c10..4a80a2d 100644
 --- printing/renderer/print_web_view_helper_mac.mm
 +++ printing/renderer/print_web_view_helper_mac.mm
@@ -69,7 +69,6 @@ void PrintWebViewHelper::PrintPageInternal(
--- a/patch/patches/public_browser_1257.patch
+++ b/patch/patches/public_browser_1257.patch
@@ -14,7 +14,7 @@ index 1b6d8a6..b606a30 100644
 WebContents::CreateParams::~CreateParams() {
 }
 diff --git web_contents.h web_contents.h
-index a96ed1c..d0a6772 100644
+index 5260b91..4495078 100644
 --- web_contents.h
 +++ web_contents.h
@@ -54,9 +54,11 @@ class PageState;
@@ -41,7 +41,7 @@ index a96ed1c..d0a6772 100644
 
   // Creates a new WebContents.
 diff --git web_contents_delegate.cc web_contents_delegate.cc
-index 0a1d3f1..1d03511 100644
+index 71c3075..7abcac3 100644
 --- web_contents_delegate.cc
 +++ web_contents_delegate.cc
@@ -144,7 +144,9 @@ bool WebContentsDelegate::ShouldCreateWebContents(
@@ -56,7 +56,7 @@ index 0a1d3f1..1d03511 100644
 }
 
 diff --git web_contents_delegate.h web_contents_delegate.h
-index ed46e43..9ffeee9 100644
+index b6015b0..75b53d4 100644
 --- web_contents_delegate.h
 +++ web_contents_delegate.h
@@ -41,9 +41,11 @@ class DownloadItem;
@@ -71,7 +71,7 @@ index ed46e43..9ffeee9 100644
 struct ColorSuggestion;
 struct ContextMenuParams;
 struct DropData;
-@@ -305,7 +307,9 @@ class CONTENT_EXPORT WebContentsDelegate {
+@@ -309,7 +311,9 @@ class CONTENT_EXPORT WebContentsDelegate {
       const std::string& frame_name,
       const GURL& target_url,
       const std::string& partition_id,
--- 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 ef38d30..00fb343 100644
+index acc1c8a..c07cb49 100644
 --- render_widget_host_view_mac.mm
 +++ render_widget_host_view_mac.mm
@@ -530,9 +530,6 @@ RenderWidgetHostViewMac::RenderWidgetHostViewMac(RenderWidgetHost* widget,
--- a/patch/patches/renderer_preferences_util_545103.patch
+++ b/patch/patches/renderer_preferences_util_545103.patch
@@ -1,5 +1,5 @@
 diff --git renderer_preferences_util.cc renderer_preferences_util.cc
-index a6498fc..4bf2cf91 100644
+index 2fff3f3..86c7f0c 100644
 --- renderer_preferences_util.cc
 +++ renderer_preferences_util.cc
@@ -27,7 +27,8 @@
--- a/patch/patches/spellcheck_137.patch
+++ b/patch/patches/spellcheck_137.patch
@@ -1,5 +1,5 @@
 diff --git spellcheck_factory.cc spellcheck_factory.cc
-index 87b5b9e..8e6dfff 100644
+index 3fd085b..b2705bf 100644
 --- spellcheck_factory.cc
 +++ spellcheck_factory.cc
@@ -16,6 +16,13 @@
--- a/patch/patches/supports_user_data_1710.patch
+++ b/patch/patches/supports_user_data_1710.patch
@@ -1,5 +1,5 @@
 diff --git supports_user_data.h supports_user_data.h
-index 5c1c7e9..77c9253 100644
+index ab40c1b..2b145e8 100644
 --- supports_user_data.h
 +++ supports_user_data.h
@@ -33,9 +33,9 @@ class BASE_EXPORT SupportsUserData {
--- a/patch/patches/views_widget_180_1677.patch
+++ b/patch/patches/views_widget_180_1677.patch
@@ -1,9 +1,9 @@
 diff --git content/browser/renderer_host/render_widget_host_view_aura.cc content/browser/renderer_host/render_widget_host_view_aura.cc
-index c5494d9..6515181 100644
+index d06fde4..329432e 100644
 --- content/browser/renderer_host/render_widget_host_view_aura.cc
 +++ content/browser/renderer_host/render_widget_host_view_aura.cc
-@@ -774,6 +774,13 @@ void RenderWidgetHostViewAura::SetKeyboardFocus() {
-       ::SetFocus(host->GetAcceleratedWidget());
+@@ -776,6 +776,13 @@ void RenderWidgetHostViewAura::SetKeyboardFocus() {
+     }
   }
 #endif
 +#if defined(OS_LINUX)
@@ -17,10 +17,10 @@ index c5494d9..6515181 100644
     set_focus_on_mouse_down_or_key_event_ = false;
     host_->Focus();
 diff --git content/browser/renderer_host/render_widget_host_view_base.cc content/browser/renderer_host/render_widget_host_view_base.cc
-index a2a0884..c6eef9d 100644
+index 780ced5..9409858 100644
 --- content/browser/renderer_host/render_widget_host_view_base.cc
 +++ content/browser/renderer_host/render_widget_host_view_base.cc
-@@ -375,6 +375,7 @@ RenderWidgetHostViewBase::RenderWidgetHostViewBase()
+@@ -376,6 +376,7 @@ RenderWidgetHostViewBase::RenderWidgetHostViewBase()
       current_device_scale_factor_(0),
       current_display_rotation_(gfx::Display::ROTATE_0),
       pinch_zoom_enabled_(content::IsPinchToZoomEnabled()),
@@ -40,18 +40,18 @@ index a2a0884..c6eef9d 100644
   return renderer_frame_number_;
 }
 diff --git content/browser/renderer_host/render_widget_host_view_base.h content/browser/renderer_host/render_widget_host_view_base.h
-index d714137..9d17d2f 100644
+index 9a2e25b..dd753a5 100644
 --- content/browser/renderer_host/render_widget_host_view_base.h
 +++ content/browser/renderer_host/render_widget_host_view_base.h
-@@ -87,6 +87,7 @@ class CONTENT_EXPORT RenderWidgetHostViewBase : public RenderWidgetHostView,
+@@ -95,6 +95,7 @@ class CONTENT_EXPORT RenderWidgetHostViewBase : public RenderWidgetHostView,
   void BeginFrameSubscription(
       scoped_ptr<RenderWidgetHostViewFrameSubscriber> subscriber) override;
   void EndFrameSubscription() override;
 +  void SetHasExternalParent(bool val) override;
 
-   // IPC::Listener implementation:
-   bool OnMessageReceived(const IPC::Message& msg) override;
-@@ -438,6 +439,10 @@ class CONTENT_EXPORT RenderWidgetHostViewBase : public RenderWidgetHostView,
+   // This only needs to be overridden by RenderWidgetHostViewBase subclasses
+   // that handle content embedded within other RenderWidgetHostViews.
+@@ -445,6 +446,10 @@ class CONTENT_EXPORT RenderWidgetHostViewBase : public RenderWidgetHostView,
   // renderer.
   bool pinch_zoom_enabled_;
 
@@ -63,10 +63,10 @@ index d714137..9d17d2f 100644
   void FlushInput();
 
 diff --git content/public/browser/render_widget_host_view.h content/public/browser/render_widget_host_view.h
-index 9b48ddb..0314569 100644
+index 7c749a2..df2a254 100644
 --- content/public/browser/render_widget_host_view.h
 +++ content/public/browser/render_widget_host_view.h
-@@ -146,6 +146,10 @@ class CONTENT_EXPORT RenderWidgetHostView {
+@@ -159,6 +159,10 @@ class CONTENT_EXPORT RenderWidgetHostView {
   // deleted after this call.
   virtual void EndFrameSubscription() = 0;
 
@@ -91,7 +91,7 @@ index a8e088c..838b6a0 100644
   return host ? host->GetAcceleratedWidget() : NULL;
 }
 diff --git ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
-index c354154..c6f0fc9 100644
+index f79b3c4..f585bea 100644
 --- ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
 +++ ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
@@ -84,6 +84,7 @@ DesktopWindowTreeHostWin::DesktopWindowTreeHostWin(
@@ -102,7 +102,7 @@ index c354154..c6f0fc9 100644
       tooltip_(NULL) {
 }
 
-@@ -133,8 +134,12 @@ void DesktopWindowTreeHostWin::Init(aura::Window* content_window,
+@@ -134,8 +135,12 @@ void DesktopWindowTreeHostWin::Init(aura::Window* content_window,
                         native_widget_delegate_);
 
   HWND parent_hwnd = NULL;
@@ -116,7 +116,7 @@ index c354154..c6f0fc9 100644
 
   message_handler_->set_remove_standard_frame(params.remove_standard_frame);
 
-@@ -799,11 +804,15 @@ void DesktopWindowTreeHostWin::HandleFrameChanged() {
+@@ -800,11 +805,15 @@ void DesktopWindowTreeHostWin::HandleFrameChanged() {
 }
 
 void DesktopWindowTreeHostWin::HandleNativeFocus(HWND last_focused_window) {
@@ -135,7 +135,7 @@ index c354154..c6f0fc9 100644
 
 bool DesktopWindowTreeHostWin::HandleMouseEvent(const ui::MouseEvent& event) {
 diff --git ui/views/widget/desktop_aura/desktop_window_tree_host_win.h ui/views/widget/desktop_aura/desktop_window_tree_host_win.h
-index ad82485..13e74b9 100644
+index 963658a..36c8d63 100644
 --- ui/views/widget/desktop_aura/desktop_window_tree_host_win.h
 +++ ui/views/widget/desktop_aura/desktop_window_tree_host_win.h
@@ -244,6 +244,10 @@ class VIEWS_EXPORT DesktopWindowTreeHostWin
@@ -150,10 +150,10 @@ index ad82485..13e74b9 100644
   // a reference.
   corewm::TooltipWin* tooltip_;
 diff --git ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc
-index f7495f0..3d9b9a2 100644
+index e2eaf14..0652daa 100644
 --- ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc
 +++ ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc
-@@ -168,6 +168,7 @@ DesktopWindowTreeHostX11::DesktopWindowTreeHostX11(
+@@ -167,6 +167,7 @@ DesktopWindowTreeHostX11::DesktopWindowTreeHostX11(
       use_native_frame_(false),
       should_maximize_after_map_(false),
       use_argb_visual_(false),
@@ -161,17 +161,17 @@ index f7495f0..3d9b9a2 100644
       drag_drop_client_(NULL),
       native_widget_delegate_(native_widget_delegate),
       desktop_native_widget_aura_(desktop_native_widget_aura),
-@@ -177,7 +178,8 @@ DesktopWindowTreeHostX11::DesktopWindowTreeHostX11(
+@@ -175,7 +176,8 @@ DesktopWindowTreeHostX11::DesktopWindowTreeHostX11(
+       custom_window_shape_(false),
       urgency_hint_set_(false),
       activatable_(true),
-       modal_dialog_xid_(0),
 -      close_widget_factory_(this) {
 +      close_widget_factory_(this),
 +      xwindow_destroyed_(false) {
 }
 
 DesktopWindowTreeHostX11::~DesktopWindowTreeHostX11() {
-@@ -388,7 +390,8 @@ void DesktopWindowTreeHostX11::CloseNow() {
+@@ -386,7 +388,8 @@ void DesktopWindowTreeHostX11::CloseNow() {
   // Actually free our native resources.
   if (ui::PlatformEventSource::GetInstance())
     ui::PlatformEventSource::GetInstance()->RemovePlatformEventDispatcher(this);
@@ -181,7 +181,7 @@ index f7495f0..3d9b9a2 100644
   xwindow_ = None;
 
   desktop_native_widget_aura_->OnHostClosed();
-@@ -537,6 +540,8 @@ void DesktopWindowTreeHostX11::GetWindowPlacement(
+@@ -535,6 +538,8 @@ void DesktopWindowTreeHostX11::GetWindowPlacement(
 }
 
 gfx::Rect DesktopWindowTreeHostX11::GetWindowBoundsInScreen() const {
@@ -190,7 +190,7 @@ index f7495f0..3d9b9a2 100644
   return ToDIPRect(bounds_in_pixels_);
 }
 
-@@ -974,6 +979,8 @@ void DesktopWindowTreeHostX11::HideImpl() {
+@@ -972,6 +977,8 @@ void DesktopWindowTreeHostX11::HideImpl() {
 }
 
 gfx::Rect DesktopWindowTreeHostX11::GetBounds() const {
@@ -199,7 +199,7 @@ index f7495f0..3d9b9a2 100644
   return bounds_in_pixels_;
 }
 
-@@ -1031,6 +1038,8 @@ void DesktopWindowTreeHostX11::SetBounds(
+@@ -1029,6 +1036,8 @@ void DesktopWindowTreeHostX11::SetBounds(
 }
 
 gfx::Point DesktopWindowTreeHostX11::GetLocationOnNativeScreen() const {
@@ -208,7 +208,7 @@ index f7495f0..3d9b9a2 100644
   return bounds_in_pixels_.origin();
 }
 
-@@ -1139,9 +1148,15 @@ void DesktopWindowTreeHostX11::InitX11Window(
+@@ -1137,9 +1146,15 @@ void DesktopWindowTreeHostX11::InitX11Window(
     use_argb_visual_ = true;
   }
 
@@ -225,7 +225,7 @@ index f7495f0..3d9b9a2 100644
                            bounds_in_pixels_.y(), bounds_in_pixels_.width(),
                            bounds_in_pixels_.height(),
                            0,  // border width
-@@ -1770,6 +1785,10 @@ uint32_t DesktopWindowTreeHostX11::DispatchEvent(
+@@ -1767,6 +1782,10 @@ uint32_t DesktopWindowTreeHostX11::DispatchEvent(
       }
       break;
     }
@@ -237,12 +237,12 @@ index f7495f0..3d9b9a2 100644
       if (xev->xfocus.mode != NotifyGrab) {
         ReleaseCapture();
 diff --git ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h
-index 1036152..7b2b426 100644
+index 759194f..13af979 100644
 --- ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h
 +++ ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h
-@@ -98,6 +98,12 @@ class VIEWS_EXPORT DesktopWindowTreeHostX11
-   // there is no dialog on the host window.
-   XID GetModalDialog();
+@@ -87,6 +87,12 @@ class VIEWS_EXPORT DesktopWindowTreeHostX11
+   // internal list of open windows.
+   static void CleanUpWindowList(void (*func)(aura::Window* window));
 
 +  void set_screen_bounds(const gfx::Rect& bounds) { screen_bounds_ = bounds; }
 +
@@ -253,7 +253,7 @@ index 1036152..7b2b426 100644
  protected:
   // Overridden from DesktopWindowTreeHost:
   void Init(aura::Window* content_window,
-@@ -274,6 +280,9 @@ class VIEWS_EXPORT DesktopWindowTreeHostX11
+@@ -263,6 +269,9 @@ class VIEWS_EXPORT DesktopWindowTreeHostX11
   // The bounds of |xwindow_|.
   gfx::Rect bounds_in_pixels_;
 
@@ -263,7 +263,7 @@ index 1036152..7b2b426 100644
   // Whenever the bounds are set, we keep the previous set of bounds around so
   // we can have a better chance of getting the real
   // |restored_bounds_in_pixels_|. Window managers tend to send a Configure
-@@ -310,6 +319,10 @@ class VIEWS_EXPORT DesktopWindowTreeHostX11
+@@ -299,6 +308,10 @@ class VIEWS_EXPORT DesktopWindowTreeHostX11
   // Whether we used an ARGB visual for our window.
   bool use_argb_visual_;
 
@@ -274,7 +274,7 @@ index 1036152..7b2b426 100644
   DesktopDragDropClientAuraX11* drag_drop_client_;
 
   scoped_ptr<ui::EventHandler> x11_non_client_event_filter_;
-@@ -366,6 +379,9 @@ class VIEWS_EXPORT DesktopWindowTreeHostX11
+@@ -351,6 +364,9 @@ class VIEWS_EXPORT DesktopWindowTreeHostX11
 
   base::WeakPtrFactory<DesktopWindowTreeHostX11> close_widget_factory_;
 
@@ -285,7 +285,7 @@ index 1036152..7b2b426 100644
 };
 
 diff --git ui/views/widget/desktop_aura/x11_desktop_handler.cc ui/views/widget/desktop_aura/x11_desktop_handler.cc
-index 9b20295..20b1aec 100644
+index 5ab84f9..c4095fa 100644
 --- ui/views/widget/desktop_aura/x11_desktop_handler.cc
 +++ ui/views/widget/desktop_aura/x11_desktop_handler.cc
@@ -31,6 +31,30 @@ views::X11DesktopHandler* g_handler = NULL;
@@ -346,26 +346,18 @@ index 9b20295..20b1aec 100644
           x_active_window_ = None;
         }
 diff --git ui/views/widget/widget.cc ui/views/widget/widget.cc
-index 18aa4c6..147c5a7 100644
+index 88a68da..faf4da6 100644
 --- ui/views/widget/widget.cc
 +++ ui/views/widget/widget.cc
-@@ -126,6 +126,7 @@ Widget::InitParams::InitParams()
+@@ -128,6 +128,7 @@ Widget::InitParams::InitParams(Type type)
       use_system_default_icon(false),
       show_state(ui::SHOW_STATE_DEFAULT),
       parent(nullptr),
 +      parent_widget(gfx::kNullAcceleratedWidget),
       native_widget(nullptr),
-       native_theme(nullptr),
       desktop_window_tree_host(nullptr),
-@@ -151,6 +152,7 @@ Widget::InitParams::InitParams(Type type)
-       use_system_default_icon(false),
-       show_state(ui::SHOW_STATE_DEFAULT),
-       parent(nullptr),
-+      parent_widget(gfx::kNullAcceleratedWidget),
-       native_widget(nullptr),
-       native_theme(nullptr),
-       desktop_window_tree_host(nullptr),
-@@ -328,7 +330,7 @@ void Widget::Init(const InitParams& in_params) {
+       layer_type(ui::LAYER_TEXTURED),
+@@ -303,7 +304,7 @@ void Widget::Init(const InitParams& in_params) {
   InitParams params = in_params;
 
   params.child |= (params.type == InitParams::TYPE_CONTROL);
@@ -374,7 +366,7 @@ index 18aa4c6..147c5a7 100644
 
   if (params.opacity == views::Widget::InitParams::INFER_OPACITY &&
       params.type != views::Widget::InitParams::TYPE_WINDOW &&
-@@ -391,7 +393,12 @@ void Widget::Init(const InitParams& in_params) {
+@@ -365,7 +366,12 @@ void Widget::Init(const InitParams& in_params) {
       Minimize();
   } else if (params.delegate) {
     SetContentsView(params.delegate->GetContentsView());
@@ -389,10 +381,10 @@ index 18aa4c6..147c5a7 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 ui/views/widget/widget.h ui/views/widget/widget.h
-index 80aadde..c278b84 100644
+index 8c92b90..869a7b8 100644
 --- ui/views/widget/widget.h
 +++ ui/views/widget/widget.h
-@@ -234,6 +234,7 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate,
+@@ -233,6 +233,7 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate,
     // Whether the widget should be maximized or minimized.
     ui::WindowShowState show_state;
     gfx::NativeView parent;
--- a/patch/patches/webkit_popups.patch
+++ b/patch/patches/webkit_popups.patch
@@ -1,8 +1,8 @@
 diff --git Source/web/ChromeClientImpl.cpp Source/web/ChromeClientImpl.cpp
-index e728623..e0f051e 100644
+index 02bb02e..eca142e 100644
 --- Source/web/ChromeClientImpl.cpp
 +++ Source/web/ChromeClientImpl.cpp
-@@ -825,7 +825,7 @@ bool ChromeClientImpl::hasOpenedPopup() const
+@@ -834,7 +834,7 @@ bool ChromeClientImpl::hasOpenedPopup() const
 PassRefPtrWillBeRawPtr<PopupMenu> ChromeClientImpl::openPopupMenu(LocalFrame& frame, HTMLSelectElement& select)
 {
     notifyPopupOpeningObservers();
@@ -12,7 +12,7 @@ index e728623..e0f051e 100644
 
     ASSERT(RuntimeEnabledFeatures::pagePopupEnabled());
 diff --git Source/web/WebViewImpl.cpp Source/web/WebViewImpl.cpp
-index 416f9d8..43934e3 100644
+index 25425db..26aac0f 100644
 --- Source/web/WebViewImpl.cpp
 +++ Source/web/WebViewImpl.cpp
@@ -476,6 +476,7 @@ WebViewImpl::WebViewImpl(WebViewClient* client)
@@ -23,7 +23,7 @@ index 416f9d8..43934e3 100644
     , m_doingDragAndDrop(false)
     , m_ignoreInputEvents(false)
     , m_compositorDeviceScaleFactorOverride(0)
-@@ -4138,9 +4139,14 @@ void WebViewImpl::pageScaleFactorChanged()
+@@ -4148,9 +4149,14 @@ void WebViewImpl::pageScaleFactorChanged()
     m_client->pageScaleFactorChanged();
 }
 
@@ -40,7 +40,7 @@ index 416f9d8..43934e3 100644
 
 void WebViewImpl::startDragging(LocalFrame* frame,
 diff --git Source/web/WebViewImpl.h Source/web/WebViewImpl.h
-index cc4c325..b709524 100644
+index 9ee6613..74e5494 100644
 --- Source/web/WebViewImpl.h
 +++ Source/web/WebViewImpl.h
@@ -395,7 +395,8 @@ public:
@@ -53,7 +53,7 @@ index cc4c325..b709524 100644
 
     bool shouldAutoResize() const
     {
-@@ -692,6 +693,8 @@ private:
+@@ -691,6 +692,8 @@ private:
     float m_fakePageScaleAnimationPageScaleFactor;
     bool m_fakePageScaleAnimationUseAnchor;