github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-04-10 03:01:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

chore: bump chromium to 94.0.4606.20 (15-x-y) (#30715)

Browse Source 
* chore: bump chromium in DEPS to 94.0.4606.20

* chore: update patches

Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
This commit is contained in:
electron-roller[bot]
2021-08-26 12:16:54 -04:00
committed by GitHub
parent b69d7af656
commit a2ae0e16b5
5 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
DEPS
View File

@@ -15,7 +15,7 @@ gclient_gn_args = [
vars = {
'chromium_version':
'94.0.4606.12',
'94.0.4606.20',
'node_version':
'v16.5.0',
'nan_version':

2
patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch
View File

@@ -46,7 +46,7 @@ index 5ca1c26117f15fe7f7ac5e1488316d4b8ef90b1a..f603bafc29279400959ea6c91fe71834
}
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
index 460fb8147bb74107218d8d8474cbbe8981568ec3..7354478b7c6af41580fda1c1ddfe0dff9e46c52e 100644
index 9385ff3857442ffbc64f8e119907914decf5b6bb..0ab5bfc402dc033e392278d867c5d85612011984 100644
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -5322,7 +5322,6 @@ test("unit_tests") {

6
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/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
index 3bfb10467c5c84cae4ab756e0f50a586aef08090..02684adb2f898616300a8ae1df54c1021b9fa067 100644
index 98af6bf02266fa32b5dfa16fe3c96c31a00f8245..2321714485e5503704866ad58626320071894d65 100644
--- a/content/browser/renderer_host/render_frame_host_impl.cc
+++ b/content/browser/renderer_host/render_frame_host_impl.cc
@@ -6348,6 +6348,7 @@ void RenderFrameHostImpl::CreateNewWindow(
@@ -6370,6 +6370,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,
@@ -220,7 +220,7 @@ index 84d32491a56528a84b4395fba1d54cdbb38d522b..09998a83c449ef8cd9f360fbcdcf7edc
} // namespace blink
diff --git a/third_party/blink/renderer/core/frame/local_dom_window.cc b/third_party/blink/renderer/core/frame/local_dom_window.cc
index 1a46a0589b5891ca0513ba9854fca034c56b25b8..d1040bc168dfd20405a09436e089a29696e31d41 100644
index a68fa9e224a9c0fe52e66e35055588a372bb5f4c..97eb2c8bf5670acdd59ac8f63d2df638ae3201d8 100644
--- a/third_party/blink/renderer/core/frame/local_dom_window.cc
+++ b/third_party/blink/renderer/core/frame/local_dom_window.cc
@@ -2008,6 +2008,7 @@ DOMWindow* LocalDOMWindow::open(v8::Isolate* isolate,

10
patches/chromium/chore_provide_iswebcontentscreationoverridden_with_full_params.patch
View File

@@ -108,10 +108,10 @@ index ef84e04d628fb5cdbaf8fbbf84af3bf23e00c522..f1ee0bee5bfd08227a29498f8410d5d3
}
diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
index b6a5989bbee666a32b61e0232f5295e9744e3343..76a4ca3da9d0afa51aae3aea955c20e9c2d9572e 100644
index 7e29403699d56081424643bd143d0f255c8e8e73..ad9f02f84ce5954d3a2ca9b7c26eab7f2c90c162 100644
--- a/chrome/browser/ui/browser.cc
+++ b/chrome/browser/ui/browser.cc
@@ -1786,12 +1786,11 @@ bool Browser::IsWebContentsCreationOverridden(
@@ -1787,12 +1787,11 @@ bool Browser::IsWebContentsCreationOverridden(
content::SiteInstance* source_site_instance,
content::mojom::WindowContainerType window_container_type,
const GURL& opener_url,
@@ -127,10 +127,10 @@ index b6a5989bbee666a32b61e0232f5295e9744e3343..76a4ca3da9d0afa51aae3aea955c20e9
WebContents* Browser::CreateCustomWebContents(
diff --git a/chrome/browser/ui/browser.h b/chrome/browser/ui/browser.h
index 17c3233034d0e40970887253c2518486cc32825e..795a8390c23ac016d05ea8898f2a082cd5a80fbc 100644
index 7649c59dde3f58b5ec153eb6146b159cfc190975..c1cc53b89d805f63fe4dcda12e02cd0a2687f926 100644
--- a/chrome/browser/ui/browser.h
+++ b/chrome/browser/ui/browser.h
@@ -798,8 +798,7 @@ class Browser : public TabStripModelObserver,
@@ -807,8 +807,7 @@ class Browser : public TabStripModelObserver,
content::SiteInstance* source_site_instance,
content::mojom::WindowContainerType window_container_type,
const GURL& opener_url,
@@ -330,7 +330,7 @@ index bb90319f768ed2f3a3e530d64bf622de585ce163..d84de1d218267887f6b8624f913438eb
content::RenderFrameHost* opener,
content::SiteInstance* source_site_instance,
diff --git a/fuchsia/engine/browser/frame_impl.cc b/fuchsia/engine/browser/frame_impl.cc
index 02bb56f98c17cf56641596390403ebead140e1eb..dee4356deda692a591d0a74171d061704f462d66 100644
index 2863abb239a77b96e638c83f47ae7219cf0ccec8..5675ad386efa99383067eb404b385cf2ec46142e 100644
--- a/fuchsia/engine/browser/frame_impl.cc
+++ b/fuchsia/engine/browser/frame_impl.cc
@@ -388,8 +388,7 @@ bool FrameImpl::IsWebContentsCreationOverridden(

4
patches/chromium/webview_fullscreen.patch
View File

@@ -14,10 +14,10 @@ Note that we also need to manually update embedder's
`api::WebContents::IsFullscreenForTabOrPending` value.
diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
index 02684adb2f898616300a8ae1df54c1021b9fa067..97fbb5355fdd67f4aab5bc1539a184e80c36c422 100644
index 2321714485e5503704866ad58626320071894d65..6fe7ae6bc9a548c067633b2c50a48b29b6ee6a98 100644
--- a/content/browser/renderer_host/render_frame_host_impl.cc
+++ b/content/browser/renderer_host/render_frame_host_impl.cc
@@ -5771,6 +5771,15 @@ void RenderFrameHostImpl::EnterFullscreen(
@@ -5793,6 +5793,15 @@ void RenderFrameHostImpl::EnterFullscreen(
notified_instances.insert(parent_site_instance);
}