mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

chore: bump chromium to 124.0.6331.0 (main) (#41474)

Browse source 
* chore: bump chromium in DEPS to 124.0.6329.0

* chore: update patches

* 5319449: Activate popups after async opener fullscreen exit transitions | 5319449

* 5321532: [//ui] Remove ContextFactory::SharedMainThreadContextProvider() | 5321532

* fixup! 5319449: Activate popups after async opener fullscreen exit transitions | 5319449

* 5319141: [OOPIF PDF] Create PdfNavigationThrottle for main frame navigations | 5319141

* test: disable webview.capturePage test for mac arm64

* chore: bump chromium in DEPS to 124.0.6337.0

* chore: update patches

* build: roll back DEPS to 124.0.6331.0

---------

Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: Keeley Hammond <khammond@slack-corp.com>
Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
Co-authored-by: VerteDinde <vertedinde@electronjs.org>
This commit is contained in:
electron-roller[bot] 2024-03-05 11:47:48 -05:00 • committed by GitHub
parent e67ab9a93d
commit 9f673c859d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
50 changed files with 225 additions and 239 deletions
Download patch file Download diff file Expand all files Collapse all files

26
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 e57f0eb4fa3ffdb7d4fa3968a87d2041c2cbf0c7..f2d9a0882c75bd061158f53864fe745257e75c91 100644
index 7904069f5a7f28bedb18f7afe187305512fc97f7..ac9e3da59e6fbde78185c4a6924af1e3cf61369b 100644
--- a/content/browser/renderer_host/render_frame_host_impl.cc
+++ b/content/browser/renderer_host/render_frame_host_impl.cc
@@ -8334,6 +8334,7 @@ void RenderFrameHostImpl::CreateNewWindow(
@@ -8347,6 +8347,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,
@ -21,10 +21,10 @@ index e57f0eb4fa3ffdb7d4fa3968a87d2041c2cbf0c7..f2d9a0882c75bd061158f53864fe7452
&no_javascript_access);
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index 27e5ffad774403590626da37e90616c4fff20759..5293c24c2539e0cfb5c0e9adf00b76b58852c8a6 100644
index 51089c5192b5f66ac7c407252d5f3f2b74fad7b3..09d791fbd4466c605dcb946b63b3dd3e7eba9fb0 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -4530,6 +4530,12 @@ FrameTree* WebContentsImpl::CreateNewWindow(
@@ -4532,6 +4532,12 @@ FrameTree* WebContentsImpl::CreateNewWindow(
auto* new_contents_impl = new_contents.get();
@ -37,7 +37,7 @@ index 27e5ffad774403590626da37e90616c4fff20759..5293c24c2539e0cfb5c0e9adf00b76b5
// If the new frame has a name, make sure any SiteInstances that can find
// this named frame have proxies for it. Must be called after
// SetSessionStorageNamespace, since this calls CreateRenderView, which uses
@@ -4571,12 +4577,6 @@ FrameTree* WebContentsImpl::CreateNewWindow(
@@ -4573,12 +4579,6 @@ FrameTree* WebContentsImpl::CreateNewWindow(
AddWebContentsDestructionObserver(new_contents_impl);
}
@ -66,10 +66,10 @@ index 9381a209cbe182c8bdde694fae763f96c28e96ef..d5268ea720b1c35e17f63cb39d31c6c1
// Operation result when the renderer asks the browser to create a new window.
diff --git a/content/public/browser/content_browser_client.cc b/content/public/browser/content_browser_client.cc
index ecf1504bf4c2bce3ff961c8dbd7eae01957ad3b8..fe34db842d6427e08b0bfc4f7d6d00028521e5d3 100644
index f7fe84d62f1d08758dc37bc8500bb69cdfc95d85..919f5669ddf1c1be282097f267010d063ac95846 100644
--- a/content/public/browser/content_browser_client.cc
+++ b/content/public/browser/content_browser_client.cc
@@ -716,6 +716,8 @@ bool ContentBrowserClient::CanCreateWindow(
@@ -717,6 +717,8 @@ bool ContentBrowserClient::CanCreateWindow(
const std::string& frame_name,
WindowOpenDisposition disposition,
const blink::mojom::WindowFeatures& features,
@ -79,7 +79,7 @@ index ecf1504bf4c2bce3ff961c8dbd7eae01957ad3b8..fe34db842d6427e08b0bfc4f7d6d0002
bool opener_suppressed,
bool* no_javascript_access) {
diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
index 9ba8e83bcc8796090901f389f3e465b3cb2a1cb3..0ceaa3c85e96a4a1672a4e63096800f87a05ffc0 100644
index d80e4ed168aaf75b4a57506f58a360524891ab01..da88d205c15eae320a4580c11c30d4dc24d8dc1e 100644
--- a/content/public/browser/content_browser_client.h
+++ b/content/public/browser/content_browser_client.h
@@ -183,6 +183,7 @@ class NetworkService;
@ -90,7 +90,7 @@ index 9ba8e83bcc8796090901f389f3e465b3cb2a1cb3..0ceaa3c85e96a4a1672a4e63096800f8
} // namespace network
namespace sandbox {
@@ -1190,6 +1191,8 @@ class CONTENT_EXPORT ContentBrowserClient {
@@ -1191,6 +1192,8 @@ class CONTENT_EXPORT ContentBrowserClient {
const std::string& frame_name,
WindowOpenDisposition disposition,
const blink::mojom::WindowFeatures& features,
@ -148,7 +148,7 @@ index cce26ecaccbfde4259ccfcf73dc9508271b7364b..7217c90d0c65203056c622120ae16120
// typically happens when popups are created.
virtual void WebContentsCreated(WebContents* source_contents,
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index 42d040033a706be496215f09cfc69e63ceb180db..391fb9dfbc484ccee73b906a8d0f689b123a2eed 100644
index 67034e12e5ca65f3e09c1461bbf0a2422b454ebb..c0ca69f77833f7138d8eb3b49a7296ff671129b0 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -6652,6 +6652,10 @@ WebView* RenderFrameImpl::CreateNewWindow(
@ -163,7 +163,7 @@ index 42d040033a706be496215f09cfc69e63ceb180db..391fb9dfbc484ccee73b906a8d0f689b
// moved on send.
bool is_background_tab =
diff --git a/content/web_test/browser/web_test_content_browser_client.cc b/content/web_test/browser/web_test_content_browser_client.cc
index 9ccceff90ee1c351fe1716a04f8acb3a48f9bca3..6f22fa9a83bab31765fa5a3f793170b6ef6fb856 100644
index 6cf5db64b526cd99c7f3f093035e934d1ce5f96f..08869632d8b68ae60d942a20657c33e58fd64e08 100644
--- a/content/web_test/browser/web_test_content_browser_client.cc
+++ b/content/web_test/browser/web_test_content_browser_client.cc
@@ -512,6 +512,8 @@ bool WebTestContentBrowserClient::CanCreateWindow(
@ -210,10 +210,10 @@ index 78956238f8d959580e928d2590866b2f4da3d218..806b3337ec8a8ad7c89681857b4e81dc
} // 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 86d2fba8e0ee3cb8ada3f0804b93140d0719288d..68f28996ef75ecf2a0ce0ce140b480f826e03caf 100644
index b4a959a7d99449a083166dc7de4250133badf862..27be63c5e60abcfbff68293891bfa95f9e44d575 100644
--- a/third_party/blink/renderer/core/frame/local_dom_window.cc
+++ b/third_party/blink/renderer/core/frame/local_dom_window.cc
@@ -2213,6 +2213,8 @@ DOMWindow* LocalDOMWindow::open(v8::Isolate* isolate,
@@ -2214,6 +2214,8 @@ DOMWindow* LocalDOMWindow::open(v8::Isolate* isolate,
WebWindowFeatures window_features =
GetWindowFeaturesFromString(features, entered_window);