From 9cc59c87ae5b48f77b3305dede102864022f5313 Mon Sep 17 00:00:00 2001
From: Marshall Greenblatt <magreenblatt@gmail.com>
Date: Fri, 2 Jun 2017 21:54:26 +0200
Subject: [PATCH] Update to Chromium version 59.0.3071.82

---
 CHROMIUM_BUILD_COMPATIBILITY.txt              |  2 +-
 patch/patch.cfg                               |  3 --
 patch/patches/chrome_widevine.patch           |  2 +-
 patch/patches/compositor_1368.patch           |  4 +-
 patch/patches/content_1129_2015.patch         | 16 +++----
 patch/patches/crashpad_1995.patch             | 20 ++++----
 patch/patches/gn_config.patch                 |  2 +-
 patch/patches/prefs_content_1161.patch        |  4 +-
 .../print_header_footer_1478_1565.patch       | 48 +++++++++----------
 .../patches/render_view_host_impl_1392.patch  |  2 +-
 .../render_widget_host_1070383005.patch       |  2 +-
 patch/patches/storage_partition_1973.patch    |  2 +-
 patch/patches/views_menu_2102.patch           | 10 ++--
 ...views_widget_180_1481_1565_1677_1749.patch | 18 ++-----
 patch/patches/web_contents_1257_1565.patch    |  4 +-
 patch/patches/webkit_plugin_info_2015.patch   |  4 +-
 patch/patches/webkit_popups.patch             |  4 +-
 patch/patches/webview_plugin_2020.patch       |  2 +-
 18 files changed, 69 insertions(+), 80 deletions(-)

diff --git a/CHROMIUM_BUILD_COMPATIBILITY.txt b/CHROMIUM_BUILD_COMPATIBILITY.txt
index e29602557..ec7c06f6e 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/59.0.3071.15',
+  'chromium_checkout': 'refs/tags/59.0.3071.82',
 }
diff --git a/patch/patch.cfg b/patch/patch.cfg
index c84d945c5..2c4e9abc5 100644
--- a/patch/patch.cfg
+++ b/patch/patch.cfg
@@ -72,9 +72,6 @@ patches = [
     #
     # Support creation of captionless windows with resizable borders.
     # https://bitbucket.org/chromiumembedded/cef/issues/1749
-    #
-    # Remove console spam from RenderWidgetHostViewBase::IsInVR.
-    # https://codereview.chromium.org/2822223002
     'name': 'views_widget_180_1481_1565_1677_1749',
   },
   {
diff --git a/patch/patches/chrome_widevine.patch b/patch/patches/chrome_widevine.patch
index 102b2073c..be6e0f033 100644
--- a/patch/patches/chrome_widevine.patch
+++ b/patch/patches/chrome_widevine.patch
@@ -1,5 +1,5 @@
 diff --git chrome/common/chrome_content_client.cc chrome/common/chrome_content_client.cc
-index de5a0d8..59251d3 100644
+index ac5ffb5..47433a2 100644
 --- chrome/common/chrome_content_client.cc
 +++ chrome/common/chrome_content_client.cc
 @@ -82,7 +82,7 @@
diff --git a/patch/patches/compositor_1368.patch b/patch/patches/compositor_1368.patch
index b63278d29..6f61ea599 100644
--- a/patch/patches/compositor_1368.patch
+++ b/patch/patches/compositor_1368.patch
@@ -17,7 +17,7 @@ index 25b59f0..5d1c80f 100644
    if (command_line->HasSwitch(switches::kHeadless))
      return base::WrapUnique(new cc::SoftwareOutputDevice);
 diff --git ui/compositor/compositor.h ui/compositor/compositor.h
-index fe85a4e..e5584d2 100644
+index 2e95a3f..625b7ae 100644
 --- ui/compositor/compositor.h
 +++ ui/compositor/compositor.h
 @@ -18,6 +18,7 @@
@@ -56,7 +56,7 @@ index fe85a4e..e5584d2 100644
    // Sets the root of the layer tree drawn by this Compositor. The root layer
    // must have no parent. The compositor's root layer is reset if the root layer
    // is destroyed. NULL can be passed to reset the root layer, in which case the
-@@ -377,6 +392,8 @@ class COMPOSITOR_EXPORT Compositor
+@@ -379,6 +394,8 @@ class COMPOSITOR_EXPORT Compositor
    ui::ContextFactory* context_factory_;
    ui::ContextFactoryPrivate* context_factory_private_;
  
diff --git a/patch/patches/content_1129_2015.patch b/patch/patches/content_1129_2015.patch
index c15a6a2f1..641b0099a 100644
--- a/patch/patches/content_1129_2015.patch
+++ b/patch/patches/content_1129_2015.patch
@@ -95,7 +95,7 @@ index 8dca644..d60c069 100644
  }
  
 diff --git content/browser/frame_host/render_frame_host_impl.cc content/browser/frame_host/render_frame_host_impl.cc
-index ccd8ee7..cc52a93 100644
+index 585a523..2ea3aa6 100644
 --- content/browser/frame_host/render_frame_host_impl.cc
 +++ content/browser/frame_host/render_frame_host_impl.cc
 @@ -814,10 +814,8 @@ bool RenderFrameHostImpl::OnMessageReceived(const IPC::Message &msg) {
@@ -133,7 +133,7 @@ index ccd8ee7..cc52a93 100644
  void RenderFrameHostImpl::OnShowCreatedWindow(int pending_widget_routing_id,
                                                WindowOpenDisposition disposition,
 diff --git content/browser/frame_host/render_frame_host_impl.h content/browser/frame_host/render_frame_host_impl.h
-index 7d13f01..9b2d494 100644
+index caf341b..f94da4c 100644
 --- content/browser/frame_host/render_frame_host_impl.h
 +++ content/browser/frame_host/render_frame_host_impl.h
 @@ -783,8 +783,8 @@ class CONTENT_EXPORT RenderFrameHostImpl
@@ -317,10 +317,10 @@ index b8be34e..db85a84 100644
  // Adding a new message? Stick to the sort order above: first platform
  // independent FrameMsg, then ifdefs for platform specific FrameMsg, then
 diff --git content/ppapi_plugin/ppapi_blink_platform_impl.cc content/ppapi_plugin/ppapi_blink_platform_impl.cc
-index 6c24359..279edb2 100644
+index bf0088e..e70677e 100644
 --- content/ppapi_plugin/ppapi_blink_platform_impl.cc
 +++ content/ppapi_plugin/ppapi_blink_platform_impl.cc
-@@ -211,6 +211,7 @@ blink::WebURLLoader* PpapiBlinkPlatformImpl::CreateURLLoader() {
+@@ -212,6 +212,7 @@ blink::WebURLLoader* PpapiBlinkPlatformImpl::CreateURLLoader() {
  
  void PpapiBlinkPlatformImpl::GetPluginList(
      bool refresh,
@@ -405,10 +405,10 @@ index d544fb7..260079c 100644
    // built in media player for the given |url|. Defaults to false.
    virtual bool ShouldUseMediaPlayerForURL(const GURL& url);
 diff --git content/renderer/render_frame_impl.cc content/renderer/render_frame_impl.cc
-index 32ad5da..39fbe72 100644
+index ffb4d51..adfb515 100644
 --- content/renderer/render_frame_impl.cc
 +++ content/renderer/render_frame_impl.cc
-@@ -2795,7 +2795,8 @@ blink::WebPlugin* RenderFrameImpl::CreatePlugin(
+@@ -2788,7 +2788,8 @@ blink::WebPlugin* RenderFrameImpl::CreatePlugin(
    std::string mime_type;
    bool found = false;
    Send(new FrameHostMsg_GetPluginInfo(
@@ -418,7 +418,7 @@ index 32ad5da..39fbe72 100644
        params.mime_type.Utf8(), &found, &info, &mime_type));
    if (!found)
      return NULL;
-@@ -5362,9 +5363,8 @@ WebNavigationPolicy RenderFrameImpl::DecidePolicyForNavigation(
+@@ -5337,9 +5338,8 @@ WebNavigationPolicy RenderFrameImpl::DecidePolicyForNavigation(
         (!IsBrowserSideNavigationEnabled() ||
          url != pending_navigation_params_->request_params.redirects[0]));
  
@@ -430,7 +430,7 @@ index 32ad5da..39fbe72 100644
    // The handlenavigation API is deprecated and will be removed once
    // crbug.com/325351 is resolved.
    if (GetContentClient()->renderer()->HandleNavigation(
-@@ -5377,7 +5377,6 @@ WebNavigationPolicy RenderFrameImpl::DecidePolicyForNavigation(
+@@ -5352,7 +5352,6 @@ WebNavigationPolicy RenderFrameImpl::DecidePolicyForNavigation(
      }
      return blink::kWebNavigationPolicyIgnore;
    }
diff --git a/patch/patches/crashpad_1995.patch b/patch/patches/crashpad_1995.patch
index 7edf901fa..d1502e521 100644
--- a/patch/patches/crashpad_1995.patch
+++ b/patch/patches/crashpad_1995.patch
@@ -31,7 +31,7 @@ index c4ca09c..40b981e 100644
      cflags = [ "/wd4201" ]
    }
 diff --git chrome/common/crash_keys.cc chrome/common/crash_keys.cc
-index 78b04f4..abf9c98 100644
+index 1e332ab..0290e49 100644
 --- chrome/common/crash_keys.cc
 +++ chrome/common/crash_keys.cc
 @@ -4,6 +4,8 @@
@@ -52,7 +52,7 @@ index 78b04f4..abf9c98 100644
    // The following keys may be chunked by the underlying crash logging system,
    // but ultimately constitute a single key-value pair.
    //
-@@ -254,10 +256,16 @@ size_t RegisterChromeCrashKeys() {
+@@ -233,10 +235,16 @@ size_t RegisterChromeCrashKeys() {
  
    // This dynamic set of keys is used for sets of key value pairs when gathering
    // a collection of data, like command line switches or extension IDs.
@@ -71,7 +71,7 @@ index 78b04f4..abf9c98 100644
  
    // Register the extension IDs.
    {
-@@ -291,7 +299,7 @@ size_t RegisterChromeCrashKeys() {
+@@ -270,7 +278,7 @@ size_t RegisterChromeCrashKeys() {
    return base::debug::InitCrashKeys(&keys.at(0), keys.size(), kChunkMaxLength);
  }
  
@@ -80,7 +80,7 @@ index 78b04f4..abf9c98 100644
    static const char* const kIgnoreSwitches[] = {
      switches::kEnableLogging,
      switches::kFlagSwitchesBegin,
-@@ -347,7 +355,7 @@ static bool IsBoringSwitch(const std::string& flag) {
+@@ -326,7 +334,7 @@ static bool IsBoringSwitch(const std::string& flag) {
  }
  
  void SetCrashKeysFromCommandLine(const base::CommandLine& command_line) {
@@ -437,7 +437,7 @@ index dcec346..6272df6 100644
          crashpad::TriState::kDisabled);
    }
 diff --git components/crash/content/app/crashpad_mac.mm components/crash/content/app/crashpad_mac.mm
-index 3bae07e..12b0a16 100644
+index 3bae07e..b2bee0e 100644
 --- components/crash/content/app/crashpad_mac.mm
 +++ components/crash/content/app/crashpad_mac.mm
 @@ -16,11 +16,14 @@
@@ -524,21 +524,21 @@ index 3bae07e..12b0a16 100644
  
        std::vector<std::string> arguments;
  
-@@ -105,6 +124,12 @@ base::FilePath PlatformCrashpadInitialization(bool initial_client,
-         arguments.push_back(
+@@ -106,6 +125,12 @@ base::FilePath PlatformCrashpadInitialization(bool initial_client,
              "--reset-own-crash-exception-port-to-system-default");
        }
-+
+ 
 +      // Since we're using the same subprocess helper exe we must specify the
 +      // process type.
 +      arguments.push_back(std::string("--type=") + switches::kCrashpadHandler);
 +
 +      crash_reporter_client->GetCrashOptionalArguments(&arguments);
- 
++
        bool result = GetCrashpadClient().StartHandler(
            handler_path, database_path, metrics_path, url, process_annotations,
+           arguments, true, false);
 diff --git components/crash/content/app/crashpad_win.cc components/crash/content/app/crashpad_win.cc
-index 94a350f..61667a8 100644
+index 94a350f..4de2228 100644
 --- components/crash/content/app/crashpad_win.cc
 +++ components/crash/content/app/crashpad_win.cc
 @@ -33,8 +33,8 @@ void GetPlatformCrashpadAnnotations(
diff --git a/patch/patches/gn_config.patch b/patch/patches/gn_config.patch
index a88585406..399bc0c89 100644
--- a/patch/patches/gn_config.patch
+++ b/patch/patches/gn_config.patch
@@ -12,7 +12,7 @@ index cd7ed79..0c318f9 100644
        # https://crbug.com/474506.
        "//clank/java/BUILD.gn",
 diff --git BUILD.gn BUILD.gn
-index d24c2da..7f0d451 100644
+index 5559319..65fde09 100644
 --- BUILD.gn
 +++ BUILD.gn
 @@ -158,6 +158,7 @@ group("gn_all") {
diff --git a/patch/patches/prefs_content_1161.patch b/patch/patches/prefs_content_1161.patch
index fcf00869f..58bdc7233 100644
--- a/patch/patches/prefs_content_1161.patch
+++ b/patch/patches/prefs_content_1161.patch
@@ -35,10 +35,10 @@ index ae9756c..d0f2f1b 100644
    bool inert_visual_viewport;
    bool record_whole_document;
 diff --git content/renderer/render_view_impl.cc content/renderer/render_view_impl.cc
-index 7d6113c..d600026 100644
+index 0aff3509..0e2b19d 100644
 --- content/renderer/render_view_impl.cc
 +++ content/renderer/render_view_impl.cc
-@@ -1383,6 +1383,8 @@ void RenderViewImpl::ApplyWebPreferencesInternal(
+@@ -1374,6 +1374,8 @@ void RenderViewImpl::ApplyWebPreferencesInternal(
      blink::WebView* web_view,
      CompositorDependencies* compositor_deps) {
    ApplyWebPreferences(prefs, web_view);
diff --git a/patch/patches/print_header_footer_1478_1565.patch b/patch/patches/print_header_footer_1478_1565.patch
index 69cff3a47..f8453342b 100644
--- a/patch/patches/print_header_footer_1478_1565.patch
+++ b/patch/patches/print_header_footer_1478_1565.patch
@@ -198,7 +198,7 @@ index d11d28d..e075be3 100644
                      PrintHostMsg_SetOptionsFromDocument_Params /* params */)
 -#endif  // BUILDFLAG(ENABLE_PRINT_PREVIEW)
 diff --git components/printing/renderer/print_web_view_helper.cc components/printing/renderer/print_web_view_helper.cc
-index 7f22427..bf43260 100644
+index ab05590..43d13ae 100644
 --- components/printing/renderer/print_web_view_helper.cc
 +++ components/printing/renderer/print_web_view_helper.cc
 @@ -89,6 +89,9 @@ const float kPrintingMinimumShrinkFactor = 1.333f;
@@ -277,7 +277,7 @@ index 7f22427..bf43260 100644
        is_loading_(false),
        is_scripted_preview_delayed_(false),
        ipc_nesting_level_(0),
-@@ -970,10 +965,8 @@ void PrintWebViewHelper::ScriptedPrint(bool user_initiated) {
+@@ -971,10 +966,8 @@ void PrintWebViewHelper::ScriptedPrint(bool user_initiated) {
      return;
  
    if (g_is_preview_enabled) {
@@ -288,7 +288,7 @@ index 7f22427..bf43260 100644
    } else {
  #if BUILDFLAG(ENABLE_BASIC_PRINTING)
      Print(web_frame, blink::WebNode(), true /* is_scripted? */);
-@@ -1001,14 +994,10 @@ bool PrintWebViewHelper::OnMessageReceived(const IPC::Message& message) {
+@@ -1000,14 +993,10 @@ bool PrintWebViewHelper::OnMessageReceived(const IPC::Message& message) {
      IPC_MESSAGE_HANDLER(PrintMsg_PrintPages, OnPrintPages)
      IPC_MESSAGE_HANDLER(PrintMsg_PrintForSystemDialog, OnPrintForSystemDialog)
  #endif  // BUILDFLAG(ENABLE_BASIC_PRINTING)
@@ -303,7 +303,7 @@ index 7f22427..bf43260 100644
      IPC_MESSAGE_HANDLER(PrintMsg_SetPrintingEnabled, OnSetPrintingEnabled)
      IPC_MESSAGE_UNHANDLED(handled = false)
    IPC_END_MESSAGE_MAP()
-@@ -1052,7 +1041,6 @@ void PrintWebViewHelper::OnPrintForSystemDialog() {
+@@ -1055,7 +1044,6 @@ void PrintWebViewHelper::OnPrintForSystemDialog() {
  }
  #endif  // BUILDFLAG(ENABLE_BASIC_PRINTING)
  
@@ -311,7 +311,7 @@ index 7f22427..bf43260 100644
  void PrintWebViewHelper::OnPrintForPrintPreview(
      const base::DictionaryValue& job_settings) {
    CHECK_LE(ipc_nesting_level_, 1);
-@@ -1112,7 +1100,6 @@ void PrintWebViewHelper::OnPrintForPrintPreview(
+@@ -1115,7 +1103,6 @@ void PrintWebViewHelper::OnPrintForPrintPreview(
      DidFinishPrinting(FAIL_PRINT);
    }
  }
@@ -319,7 +319,7 @@ index 7f22427..bf43260 100644
  
  void PrintWebViewHelper::GetPageSizeAndContentAreaFromPageLayout(
      const PageSizeMargins& page_layout_in_points,
-@@ -1137,7 +1124,6 @@ void PrintWebViewHelper::UpdateFrameMarginsCssInfo(
+@@ -1140,7 +1127,6 @@ void PrintWebViewHelper::UpdateFrameMarginsCssInfo(
    ignore_css_margins_ = (margins_type != DEFAULT_MARGINS);
  }
  
@@ -327,7 +327,7 @@ index 7f22427..bf43260 100644
  void PrintWebViewHelper::OnPrintPreview(const base::DictionaryValue& settings) {
    if (ipc_nesting_level_ > 1)
      return;
-@@ -1333,7 +1319,7 @@ bool PrintWebViewHelper::CreatePreviewDocument() {
+@@ -1336,7 +1322,7 @@ bool PrintWebViewHelper::CreatePreviewDocument() {
    return true;
  }
  
@@ -336,7 +336,7 @@ index 7f22427..bf43260 100644
  bool PrintWebViewHelper::RenderPreviewPage(
      int page_number,
      const PrintMsg_Print_Params& print_params) {
-@@ -1361,7 +1347,7 @@ bool PrintWebViewHelper::RenderPreviewPage(
+@@ -1364,7 +1350,7 @@ bool PrintWebViewHelper::RenderPreviewPage(
    }
    return PreviewPageRendered(page_number, draft_metafile.get());
  }
@@ -345,7 +345,7 @@ index 7f22427..bf43260 100644
  
  bool PrintWebViewHelper::FinalizePrintReadyDocument() {
    DCHECK(!is_print_ready_metafile_sent_);
-@@ -1391,7 +1377,6 @@ bool PrintWebViewHelper::FinalizePrintReadyDocument() {
+@@ -1394,7 +1380,6 @@ bool PrintWebViewHelper::FinalizePrintReadyDocument() {
    Send(new PrintHostMsg_MetafileReadyForPrinting(routing_id(), preview_params));
    return true;
  }
@@ -353,7 +353,7 @@ index 7f22427..bf43260 100644
  
  void PrintWebViewHelper::OnPrintingDone(bool success) {
    if (ipc_nesting_level_ > 1)
-@@ -1406,7 +1391,6 @@ void PrintWebViewHelper::OnSetPrintingEnabled(bool enabled) {
+@@ -1409,7 +1394,6 @@ void PrintWebViewHelper::OnSetPrintingEnabled(bool enabled) {
    is_printing_enabled_ = enabled;
  }
  
@@ -361,7 +361,7 @@ index 7f22427..bf43260 100644
  void PrintWebViewHelper::OnInitiatePrintPreview(bool has_selection) {
    if (ipc_nesting_level_ > 1)
      return;
-@@ -1417,7 +1401,9 @@ void PrintWebViewHelper::OnInitiatePrintPreview(bool has_selection) {
+@@ -1420,7 +1404,9 @@ void PrintWebViewHelper::OnInitiatePrintPreview(bool has_selection) {
    // that instead.
    auto plugin = delegate_->GetPdfElement(frame);
    if (!plugin.IsNull()) {
@@ -371,7 +371,7 @@ index 7f22427..bf43260 100644
      return;
    }
    print_preview_context_.InitWithFrame(frame);
-@@ -1425,7 +1411,6 @@ void PrintWebViewHelper::OnInitiatePrintPreview(bool has_selection) {
+@@ -1428,7 +1414,6 @@ void PrintWebViewHelper::OnInitiatePrintPreview(bool has_selection) {
                            ? PRINT_PREVIEW_USER_INITIATED_SELECTION
                            : PRINT_PREVIEW_USER_INITIATED_ENTIRE_FRAME);
  }
@@ -379,7 +379,7 @@ index 7f22427..bf43260 100644
  
  bool PrintWebViewHelper::IsPrintingEnabled() const {
    return is_printing_enabled_;
-@@ -1447,11 +1432,9 @@ void PrintWebViewHelper::PrintNode(const blink::WebNode& node) {
+@@ -1450,11 +1435,9 @@ void PrintWebViewHelper::PrintNode(const blink::WebNode& node) {
  
    print_node_in_progress_ = true;
  
@@ -392,7 +392,7 @@ index 7f22427..bf43260 100644
    } else {
  #if BUILDFLAG(ENABLE_BASIC_PRINTING)
      // Make a copy of the node, in case RenderView::OnContextMenuClosed() resets
-@@ -1540,7 +1523,6 @@ void PrintWebViewHelper::DidFinishPrinting(PrintingResult result) {
+@@ -1543,7 +1526,6 @@ void PrintWebViewHelper::DidFinishPrinting(PrintingResult result) {
        }
        break;
  
@@ -400,7 +400,7 @@ index 7f22427..bf43260 100644
      case FAIL_PREVIEW:
        int cookie =
            print_pages_params_ ? print_pages_params_->params.document_cookie : 0;
-@@ -1552,7 +1534,6 @@ void PrintWebViewHelper::DidFinishPrinting(PrintingResult result) {
+@@ -1555,7 +1537,6 @@ void PrintWebViewHelper::DidFinishPrinting(PrintingResult result) {
        }
        print_preview_context_.Failed(notify_browser_of_print_failure_);
        break;
@@ -408,7 +408,7 @@ index 7f22427..bf43260 100644
    }
    prep_frame_view_.reset();
    print_pages_params_.reset();
-@@ -1685,7 +1666,6 @@ bool PrintWebViewHelper::CalculateNumberOfPages(blink::WebLocalFrame* frame,
+@@ -1688,7 +1669,6 @@ bool PrintWebViewHelper::CalculateNumberOfPages(blink::WebLocalFrame* frame,
    return true;
  }
  
@@ -416,7 +416,7 @@ index 7f22427..bf43260 100644
  bool PrintWebViewHelper::SetOptionsFromPdfDocument(
      PrintHostMsg_SetOptionsFromDocument_Params* options) {
    blink::WebLocalFrame* source_frame = print_preview_context_.source_frame();
-@@ -1792,7 +1772,6 @@ bool PrintWebViewHelper::UpdatePrintSettings(
+@@ -1795,7 +1775,6 @@ bool PrintWebViewHelper::UpdatePrintSettings(
      print_preview_context_.set_error(PREVIEW_ERROR_INVALID_PRINTER_SETTINGS);
    return false;
  }
@@ -424,7 +424,7 @@ index 7f22427..bf43260 100644
  
  #if BUILDFLAG(ENABLE_BASIC_PRINTING)
  void PrintWebViewHelper::GetPrintSettingsFromUser(
-@@ -1854,10 +1833,8 @@ void PrintWebViewHelper::PrintPageInternal(const PrintMsg_Print_Params& params,
+@@ -1857,10 +1836,8 @@ void PrintWebViewHelper::PrintPageInternal(const PrintMsg_Print_Params& params,
    PageSizeMargins page_layout_in_points;
  
    double css_scale_factor = 1.0f;
@@ -435,7 +435,7 @@ index 7f22427..bf43260 100644
  
    // Save the original page size here to avoid rounding errors incurred by
    // converting to pixels and back and by scaling the page for reflow and
-@@ -1904,7 +1881,6 @@ void PrintWebViewHelper::PrintPageInternal(const PrintMsg_Print_Params& params,
+@@ -1907,7 +1884,6 @@ void PrintWebViewHelper::PrintPageInternal(const PrintMsg_Print_Params& params,
  
    MetafileSkiaWrapper::SetMetafileOnCanvas(canvas, metafile);
  
@@ -443,7 +443,7 @@ index 7f22427..bf43260 100644
    if (params.display_header_footer) {
      // TODO(thestig): Figure out why Linux needs this. It is almost certainly
      // |printingMinimumShrinkFactor| from Blink.
-@@ -1918,7 +1894,6 @@ void PrintWebViewHelper::PrintPageInternal(const PrintMsg_Print_Params& params,
+@@ -1921,7 +1897,6 @@ void PrintWebViewHelper::PrintPageInternal(const PrintMsg_Print_Params& params,
          canvas, page_number + 1, print_preview_context_.total_page_count(),
          *frame, scale_factor / fudge_factor, page_layout_in_points, params);
    }
@@ -451,7 +451,7 @@ index 7f22427..bf43260 100644
  
    float webkit_scale_factor = RenderPageContent(
        frame, page_number, canvas_area, content_area, scale_factor, canvas);
-@@ -1953,7 +1928,6 @@ bool PrintWebViewHelper::CopyMetafileDataToSharedMem(
+@@ -1956,7 +1931,6 @@ bool PrintWebViewHelper::CopyMetafileDataToSharedMem(
    return true;
  }
  
@@ -459,7 +459,7 @@ index 7f22427..bf43260 100644
  void PrintWebViewHelper::ShowScriptedPrintPreview() {
    if (is_scripted_preview_delayed_) {
      is_scripted_preview_delayed_ = false;
-@@ -2084,7 +2058,6 @@ bool PrintWebViewHelper::PreviewPageRendered(int page_number,
+@@ -2087,7 +2061,6 @@ bool PrintWebViewHelper::PreviewPageRendered(int page_number,
    Send(new PrintHostMsg_DidPreviewPage(routing_id(), preview_page_params));
    return true;
  }
@@ -468,7 +468,7 @@ index 7f22427..bf43260 100644
  PrintWebViewHelper::PrintPreviewContext::PrintPreviewContext()
      : total_page_count_(0),
 diff --git components/printing/renderer/print_web_view_helper.h components/printing/renderer/print_web_view_helper.h
-index 652fbf0..0050918 100644
+index 15d2c28..9dba7db 100644
 --- components/printing/renderer/print_web_view_helper.h
 +++ components/printing/renderer/print_web_view_helper.h
 @@ -153,9 +153,7 @@ class PrintWebViewHelper
@@ -556,7 +556,7 @@ index 652fbf0..0050918 100644
  
    void SetPrintPagesParams(const PrintMsg_PrintPages_Params& settings);
  
-@@ -537,6 +525,7 @@ class PrintWebViewHelper
+@@ -544,6 +532,7 @@ class PrintWebViewHelper
    ScriptingThrottler scripting_throttler_;
  
    bool print_node_in_progress_;
diff --git a/patch/patches/render_view_host_impl_1392.patch b/patch/patches/render_view_host_impl_1392.patch
index 9f76ce6ce..54e76025c 100644
--- a/patch/patches/render_view_host_impl_1392.patch
+++ b/patch/patches/render_view_host_impl_1392.patch
@@ -1,5 +1,5 @@
 diff --git content/browser/renderer_host/render_view_host_impl.h content/browser/renderer_host/render_view_host_impl.h
-index bcc702b..3753c50 100644
+index 0f5bfea..a5af1d15 100644
 --- content/browser/renderer_host/render_view_host_impl.h
 +++ content/browser/renderer_host/render_view_host_impl.h
 @@ -154,6 +154,7 @@ class CONTENT_EXPORT RenderViewHostImpl : public RenderViewHost,
diff --git a/patch/patches/render_widget_host_1070383005.patch b/patch/patches/render_widget_host_1070383005.patch
index 447df51b6..84a9a7d73 100644
--- a/patch/patches/render_widget_host_1070383005.patch
+++ b/patch/patches/render_widget_host_1070383005.patch
@@ -1,5 +1,5 @@
 diff --git content/browser/renderer_host/render_widget_host_view_mac.mm content/browser/renderer_host/render_widget_host_view_mac.mm
-index 896170a..4beadf9 100644
+index 85ece52..5edc718 100644
 --- content/browser/renderer_host/render_widget_host_view_mac.mm
 +++ content/browser/renderer_host/render_widget_host_view_mac.mm
 @@ -453,9 +453,6 @@ RenderWidgetHostViewMac::RenderWidgetHostViewMac(RenderWidgetHost* widget,
diff --git a/patch/patches/storage_partition_1973.patch b/patch/patches/storage_partition_1973.patch
index 51ceeb4dc..cc201d5c7 100644
--- a/patch/patches/storage_partition_1973.patch
+++ b/patch/patches/storage_partition_1973.patch
@@ -91,7 +91,7 @@ index 242d33e..4dfb463 100644
  
    BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
 diff --git content/browser/renderer_host/render_process_host_impl.cc content/browser/renderer_host/render_process_host_impl.cc
-index 9986ff6..0d2abbd 100644
+index 6e8f02e..bc82e8e 100644
 --- content/browser/renderer_host/render_process_host_impl.cc
 +++ content/browser/renderer_host/render_process_host_impl.cc
 @@ -661,7 +661,7 @@ void RenderProcessHostImpl::EarlyZygoteLaunch() {
diff --git a/patch/patches/views_menu_2102.patch b/patch/patches/views_menu_2102.patch
index 5538f29ab..6b50e235a 100644
--- a/patch/patches/views_menu_2102.patch
+++ b/patch/patches/views_menu_2102.patch
@@ -243,7 +243,7 @@ index 3f9436d..0bf813a1 100644
      SetSelection(item, SELECTION_UPDATE_IMMEDIATELY);
    else if (item->GetParentMenuItem()->GetParentMenuItem())
 diff --git ui/views/controls/menu/menu_delegate.h ui/views/controls/menu/menu_delegate.h
-index db99e54..7c67a04 100644
+index db99e54..49c281a 100644
 --- ui/views/controls/menu/menu_delegate.h
 +++ ui/views/controls/menu/menu_delegate.h
 @@ -10,6 +10,7 @@
@@ -254,11 +254,10 @@ index db99e54..7c67a04 100644
  #include "ui/base/dragdrop/drag_drop_types.h"
  #include "ui/base/dragdrop/os_exchange_data.h"
  #include "ui/base/ui_base_types.h"
-@@ -75,6 +76,22 @@ class VIEWS_EXPORT MenuDelegate {
-   // Whether this item should be displayed with the normal text color, even if
+@@ -76,6 +77,22 @@ class VIEWS_EXPORT MenuDelegate {
    // it's disabled.
    virtual bool GetShouldUseNormalForegroundColor(int command_id) const;
-+
+ 
 +  // Override the text color of a given menu item dependent on the |command_id|
 +  // and its |is_hovered| state. |is_minor| will be true for accelerator text.
 +  // Returns true if it chooses to override the color.
@@ -274,9 +273,10 @@ index db99e54..7c67a04 100644
 +                                  bool is_hovered,
 +                                  SkColor* override_color) const
 +                                  { return false; }
- 
++
    // The tooltip shown for the menu item. This is invoked when the user
    // hovers over the item, and no tooltip text has been set for that item.
+   virtual base::string16 GetTooltipText(int id,
 @@ -208,6 +225,11 @@ class VIEWS_EXPORT MenuDelegate {
                                         bool* has_mnemonics,
                                         MenuButton** button);
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 870bf20ce..8ed6c529f 100644
--- a/patch/patches/views_widget_180_1481_1565_1677_1749.patch
+++ b/patch/patches/views_widget_180_1481_1565_1677_1749.patch
@@ -1,5 +1,5 @@
 diff --git content/browser/renderer_host/render_widget_host_view_base.cc content/browser/renderer_host/render_widget_host_view_base.cc
-index 4dd0e59..d9394c7 100644
+index 8c862b6..d9394c7 100644
 --- content/browser/renderer_host/render_widget_host_view_base.cc
 +++ content/browser/renderer_host/render_widget_host_view_base.cc
 @@ -40,6 +40,7 @@ RenderWidgetHostViewBase::RenderWidgetHostViewBase()
@@ -10,15 +10,7 @@ index 4dd0e59..d9394c7 100644
        renderer_frame_number_(0),
        weak_factory_(this) {}
  
-@@ -138,7 +139,6 @@ void RenderWidgetHostViewBase::SetIsInVR(bool is_in_vr) {
- }
- 
- bool RenderWidgetHostViewBase::IsInVR() const {
--  NOTIMPLEMENTED();
-   return false;
- }
- 
-@@ -310,6 +310,14 @@ void RenderWidgetHostViewBase::FocusedNodeTouched(
+@@ -309,6 +310,14 @@ void RenderWidgetHostViewBase::FocusedNodeTouched(
    DVLOG(1) << "FocusedNodeTouched: " << editable;
  }
  
@@ -141,7 +133,7 @@ index f772f64..7d13f9f 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 fd25fc6..80b8093 100644
+index c2e63e9..6448b34 100644
 --- ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
 +++ ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
 @@ -85,6 +85,7 @@ DesktopWindowTreeHostWin::DesktopWindowTreeHostWin(
@@ -380,10 +372,10 @@ index 36b86ea..9a39084 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 7590741..0e06a35 100644
+index 4fc34c7..fe81671 100644
 --- ui/views/win/hwnd_message_handler.cc
 +++ ui/views/win/hwnd_message_handler.cc
-@@ -2664,8 +2664,12 @@ LRESULT HWNDMessageHandler::HandleMouseEventInternal(UINT message,
+@@ -2665,8 +2665,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 90dec0d00..76a985088 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 6c9c358..fe5df86 100644
+index 4fa796b..71bf603 100644
 --- content/browser/web_contents/web_contents_impl.cc
 +++ content/browser/web_contents/web_contents_impl.cc
 @@ -1581,6 +1581,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
@@ -48,7 +48,7 @@ index 6c9c358..fe5df86 100644
      }
      // Save the created window associated with the route so we can show it
      // later.
-@@ -5029,7 +5045,7 @@ NavigationEntry*
+@@ -5026,7 +5042,7 @@ NavigationEntry*
  void WebContentsImpl::CreateRenderWidgetHostViewForRenderManager(
      RenderViewHost* render_view_host) {
    RenderWidgetHostViewBase* rwh_view =
diff --git a/patch/patches/webkit_plugin_info_2015.patch b/patch/patches/webkit_plugin_info_2015.patch
index 61d1510a4..cb15a5b3d 100644
--- a/patch/patches/webkit_plugin_info_2015.patch
+++ b/patch/patches/webkit_plugin_info_2015.patch
@@ -17,10 +17,10 @@ index 8aab9bb..e3286f6 100644
                                                          .Top()
                                                          ->GetSecurityContext()
 diff --git third_party/WebKit/Source/core/frame/LocalFrame.cpp third_party/WebKit/Source/core/frame/LocalFrame.cpp
-index b64d75d..869b45d 100644
+index f53bfff..7268eff 100644
 --- third_party/WebKit/Source/core/frame/LocalFrame.cpp
 +++ third_party/WebKit/Source/core/frame/LocalFrame.cpp
-@@ -927,7 +927,7 @@ ContentSettingsClient* LocalFrame::GetContentSettingsClient() {
+@@ -930,7 +930,7 @@ ContentSettingsClient* LocalFrame::GetContentSettingsClient() {
  PluginData* LocalFrame::GetPluginData() const {
    if (!Loader().AllowPlugins(kNotAboutToInstantiatePlugin))
      return nullptr;
diff --git a/patch/patches/webkit_popups.patch b/patch/patches/webkit_popups.patch
index c82fc1257..a3ecdd56f 100644
--- a/patch/patches/webkit_popups.patch
+++ b/patch/patches/webkit_popups.patch
@@ -1,8 +1,8 @@
 diff --git third_party/WebKit/Source/web/ChromeClientImpl.cpp third_party/WebKit/Source/web/ChromeClientImpl.cpp
-index ba81ee3..648d7ce 100644
+index ebb9abb..e48a16d 100644
 --- third_party/WebKit/Source/web/ChromeClientImpl.cpp
 +++ third_party/WebKit/Source/web/ChromeClientImpl.cpp
-@@ -908,7 +908,7 @@ bool ChromeClientImpl::HasOpenedPopup() const {
+@@ -909,7 +909,7 @@ bool ChromeClientImpl::HasOpenedPopup() const {
  PopupMenu* ChromeClientImpl::OpenPopupMenu(LocalFrame& frame,
                                             HTMLSelectElement& select) {
    NotifyPopupOpeningObservers();
diff --git a/patch/patches/webview_plugin_2020.patch b/patch/patches/webview_plugin_2020.patch
index 9b009dfa4..eb37d7c99 100644
--- a/patch/patches/webview_plugin_2020.patch
+++ b/patch/patches/webview_plugin_2020.patch
@@ -1,5 +1,5 @@
 diff --git chrome/app/generated_resources.grd chrome/app/generated_resources.grd
-index eabe276..63e127d 100644
+index 332e26c..5eb77ca 100644
 --- chrome/app/generated_resources.grd
 +++ chrome/app/generated_resources.grd
 @@ -5279,7 +5279,7 @@ Keep your key file in a safe place. You will need it to create new versions of y