Browse Source

chore: bump chromium to 80.0.3987.79 (8-x-y) (#21953)

* chore: bump chromium in DEPS to 80.0.3987.78

* Update patches

* chore: bump chromium in DEPS to 80.0.3987.79

Co-authored-by: John Kleinschmidt <[email protected]>
Electron Bot 5 years ago
parent
commit
3b5ca91a40

+ 1 - 1
DEPS

@@ -11,7 +11,7 @@ gclient_gn_args = [
 
 vars = {
   'chromium_version':
-    '80.0.3987.75',
+    '80.0.3987.79',
   'node_version':
     'v12.13.0',
   'nan_version':

+ 2 - 2
patches/chromium/disable_color_correct_rendering.patch

@@ -232,7 +232,7 @@ index bb814d78afc5dedbcf59ff0a9085d599385d222d..a9336275b2d2ec2d817e489a33ec8318
      service_manager::switches::kGpuSandboxAllowSysVShm,
      service_manager::switches::kGpuSandboxFailuresFatal,
 diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
-index ebf12b330fa387f463582c0870a61bc003012bcf..91c922ab4cd170f7b2de11da29ddd95effdac356 100644
+index f942380764aef7e86a0de112e9b70aed960acade..fefb63c75936a67b66aecffec5a3be04fdb0eb51 100644
 --- a/content/browser/renderer_host/render_process_host_impl.cc
 +++ b/content/browser/renderer_host/render_process_host_impl.cc
 @@ -230,6 +230,7 @@
@@ -243,7 +243,7 @@ index ebf12b330fa387f463582c0870a61bc003012bcf..91c922ab4cd170f7b2de11da29ddd95e
  #include "ui/gl/gl_switches.h"
  #include "ui/native_theme/native_theme_features.h"
  #include "url/origin.h"
-@@ -3080,6 +3081,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer(
+@@ -3083,6 +3084,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer(
    // Propagate the following switches to the renderer command line (along
    // with any associated values) if present in the browser command line.
    static const char* const kSwitchNames[] = {

+ 6 - 6
patches/chromium/frame_host_manager.patch

@@ -55,10 +55,10 @@ index f6bef176125384d58793fe0b8dddcbfc16550268..bba7dc934cd43df41949ed5b2adc70e1
      render_frame_host_ =
          frame_tree_node_->render_manager()->GetFrameHostForNavigation(this);
 diff --git a/content/browser/frame_host/render_frame_host_manager.cc b/content/browser/frame_host/render_frame_host_manager.cc
-index 5e37e9fd005fa5b653608669590910f448057e2c..14882ebb867b24e332306bdff65af68f7df0cf6f 100644
+index 2b2c5538a26d95976ebc8a75b827eebf0e536f45..acdde7935fa617e82d5a53c2cc6bc99d74eb2b7b 100644
 --- a/content/browser/frame_host/render_frame_host_manager.cc
 +++ b/content/browser/frame_host/render_frame_host_manager.cc
-@@ -2128,6 +2128,16 @@ bool RenderFrameHostManager::InitRenderView(
+@@ -2160,6 +2160,16 @@ bool RenderFrameHostManager::InitRenderView(
  scoped_refptr<SiteInstance>
  RenderFrameHostManager::GetSiteInstanceForNavigationRequest(
      NavigationRequest* request) {
@@ -75,7 +75,7 @@ index 5e37e9fd005fa5b653608669590910f448057e2c..14882ebb867b24e332306bdff65af68f
    SiteInstance* current_site_instance = render_frame_host_->GetSiteInstance();
  
    // All children of MHTML documents must be MHTML documents. They all live in
-@@ -2147,10 +2157,61 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest(
+@@ -2179,10 +2189,61 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest(
    //
    // TODO(clamy): We should also consider as a candidate SiteInstance the
    // speculative SiteInstance that was computed on redirects.
@@ -139,9 +139,9 @@ index 5e37e9fd005fa5b653608669590910f448057e2c..14882ebb867b24e332306bdff65af68f
 +    }
 +  }
  
-   scoped_refptr<SiteInstance> dest_site_instance = GetSiteInstanceForNavigation(
-       request->common_params().url, request->GetSourceSiteInstance(),
-@@ -2160,6 +2221,9 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest(
+   // Account for renderer-initiated reload as well.
+   // Needed as a workaround for https://crbug.com/1045524, remove it when it is
+@@ -2202,6 +2263,9 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest(
        request->GetRestoreType() != RestoreType::NONE, request->is_view_source(),
        request->WasServerRedirect());
  

+ 2 - 2
patches/chromium/notification_provenance.patch

@@ -108,10 +108,10 @@ index 4bf25bf1fa69f7d3869369172d375e2e489e62a1..f80ef2cecc8b111dc54e109646573a59
        mojo::PendingReceiver<blink::mojom::NotificationService> receiver);
  
 diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
-index 6b9df1cbb445f51f38030b5c71939032df0a873a..5a884022816229eb53ad0fc7040ecc4ff113ff80 100644
+index f16ee02a53137b75f7540e06040317a68332c721..845e95c571391e04700415aa63439fb785212f0f 100644
 --- a/content/browser/renderer_host/render_process_host_impl.cc
 +++ b/content/browser/renderer_host/render_process_host_impl.cc
-@@ -2007,7 +2007,7 @@ void RenderProcessHostImpl::CreateNotificationService(
+@@ -2010,7 +2010,7 @@ void RenderProcessHostImpl::CreateNotificationService(
      mojo::PendingReceiver<blink::mojom::NotificationService> receiver) {
    DCHECK_CURRENTLY_ON(BrowserThread::UI);
    storage_partition_impl_->GetPlatformNotificationContext()->CreateService(

+ 3 - 3
patches/chromium/printing.patch

@@ -63,7 +63,7 @@ index aacffd44658cac701c9683fcb3b20135a64c18bd..01cd31eb174e198724cab082e5056444
  }
  
 diff --git a/chrome/browser/printing/print_view_manager_base.cc b/chrome/browser/printing/print_view_manager_base.cc
-index 3d026cd11aa2c0b009812317995cd4e02161251e..99aac7f3932d3a8eb988337cd8dbf5c6965c87a7 100644
+index 3d026cd11aa2c0b009812317995cd4e02161251e..f2f6ded6051a0659808ec848ea4d8566449243f6 100644
 --- a/chrome/browser/printing/print_view_manager_base.cc
 +++ b/chrome/browser/printing/print_view_manager_base.cc
 @@ -27,10 +27,7 @@
@@ -205,7 +205,7 @@ index 3d026cd11aa2c0b009812317995cd4e02161251e..99aac7f3932d3a8eb988337cd8dbf5c6
    printing_succeeded_ = false;
    return true;
  }
-@@ -614,14 +627,22 @@ void PrintViewManagerBase::ReleasePrintJob() {
+@@ -614,14 +631,22 @@ void PrintViewManagerBase::ReleasePrintJob() {
    content::RenderFrameHost* rfh = printing_rfh_;
    printing_rfh_ = nullptr;
  
@@ -230,7 +230,7 @@ index 3d026cd11aa2c0b009812317995cd4e02161251e..99aac7f3932d3a8eb988337cd8dbf5c6
    // Don't close the worker thread.
    print_job_ = nullptr;
  }
-@@ -657,7 +684,7 @@ bool PrintViewManagerBase::RunInnerMessageLoop() {
+@@ -657,7 +682,7 @@ bool PrintViewManagerBase::RunInnerMessageLoop() {
  }
  
  bool PrintViewManagerBase::OpportunisticallyCreatePrintJob(int cookie) {

+ 2 - 2
patches/chromium/support_mixed_sandbox_with_zygote.patch

@@ -22,7 +22,7 @@ However, the patch would need to be reviewed by the security team, as it
 does touch a security-sensitive class.
 
 diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
-index 5a884022816229eb53ad0fc7040ecc4ff113ff80..ebf12b330fa387f463582c0870a61bc003012bcf 100644
+index 845e95c571391e04700415aa63439fb785212f0f..f942380764aef7e86a0de112e9b70aed960acade 100644
 --- a/content/browser/renderer_host/render_process_host_impl.cc
 +++ b/content/browser/renderer_host/render_process_host_impl.cc
 @@ -415,6 +415,11 @@ class RendererSandboxedProcessLauncherDelegate
@@ -62,7 +62,7 @@ index 5a884022816229eb53ad0fc7040ecc4ff113ff80..ebf12b330fa387f463582c0870a61bc0
  };
  
  const char kSessionStorageHolderKey[] = "kSessionStorageHolderKey";
-@@ -1724,11 +1735,18 @@ bool RenderProcessHostImpl::Init() {
+@@ -1723,11 +1734,18 @@ bool RenderProcessHostImpl::Init() {
        cmd_line->PrependWrapper(renderer_prefix);
      AppendRendererCommandLine(cmd_line.get());