Home Explore 引导页 在线工具 Blog
Register Sign In
Pchen0
/
electron
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

chore: bump chromium to 85.0.4183.74 (10-x-y) (#24980)

* chore: bump chromium in DEPS to 85.0.4183.71

* chore: bump chromium in DEPS to 85.0.4183.72

* chore: bump chromium in DEPS to 85.0.4183.73

* chore: bump chromium in DEPS to 85.0.4183.74

* update patches

Co-authored-by: Electron Bot <[email protected]>
Electron Bot 4 years ago
parent
596136ae99
commit
838e00a523
2 changed files with 3 additions and 3 deletions
Split View Show Diff Stats
  1. 1 1
      DEPS
  2. 2 2
      patches/chromium/can_create_window.patch

+ 1 - 1
DEPS
View File 

@@ -14,7 +14,7 @@ gclient_gn_args = [
 
 
 vars = {
 
   'chromium_version':
 
-    '85.0.4183.70',
 
+    '85.0.4183.74',
 
   'node_version':
 
     'v12.16.3',
 
   'nan_version':

+ 2 - 2
patches/chromium/can_create_window.patch
View File 

@@ -9,10 +9,10 @@ potentially prevent a window from being created.
 
 TODO(loc): this patch is currently broken.
 
 
 diff --git a/content/browser/frame_host/render_frame_host_impl.cc b/content/browser/frame_host/render_frame_host_impl.cc
 
-index 4f9c570cb14297b28eddda03fe4860342bd06cf6..e640c71b9370b6303a4132e5481a787b812a4376 100644
 
+index 0e54861c260ecfa1635ee56c1c9e931914afe901..948e3e5cf64f74ae560c64d0490c22a810d0d96f 100644
 
 --- a/content/browser/frame_host/render_frame_host_impl.cc
 
 +++ b/content/browser/frame_host/render_frame_host_impl.cc
 
-@@ -4816,6 +4816,7 @@ void RenderFrameHostImpl::CreateNewWindow(
 
+@@ -4823,6 +4823,7 @@ void RenderFrameHostImpl::CreateNewWindow(
 
            last_committed_origin_, params->window_container_type,
 
            params->target_url, params->referrer.To<Referrer>(),
 
            params->frame_name, params->disposition, *params->features,