2018-10-24 18:24:11 +00:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
2018-09-21 00:30:26 +00:00
|
|
|
From: Cheng Zhao <zcbenz@gmail.com>
|
|
|
|
Date: Thu, 20 Sep 2018 17:45:32 -0700
|
|
|
|
Subject: can_create_window.patch
|
|
|
|
|
2019-12-13 17:18:45 +00:00
|
|
|
This adds a hook to the window creation flow so that Electron can intercede and
|
|
|
|
potentially prevent a window from being created.
|
|
|
|
|
|
|
|
TODO(loc): this patch is currently broken.
|
2018-09-21 00:30:26 +00:00
|
|
|
|
2020-09-21 08:00:36 +00:00
|
|
|
diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
|
2024-09-18 01:12:11 +00:00
|
|
|
index 751ddd5f9a30605c3f9f9ad249d659092b2f0128..28664241aafdd01bbe9417b020a87672e9540417 100644
|
2020-09-21 08:00:36 +00:00
|
|
|
--- a/content/browser/renderer_host/render_frame_host_impl.cc
|
|
|
|
+++ b/content/browser/renderer_host/render_frame_host_impl.cc
|
2024-09-18 01:12:11 +00:00
|
|
|
@@ -8911,6 +8911,7 @@ void RenderFrameHostImpl::CreateNewWindow(
|
2019-01-16 18:07:52 +00:00
|
|
|
last_committed_origin_, params->window_container_type,
|
2019-01-08 23:59:47 +00:00
|
|
|
params->target_url, params->referrer.To<Referrer>(),
|
|
|
|
params->frame_name, params->disposition, *params->features,
|
2020-03-26 18:05:45 +00:00
|
|
|
+ params->raw_features, params->body,
|
2018-09-21 00:30:26 +00:00
|
|
|
effective_transient_activation_state, params->opener_suppressed,
|
|
|
|
&no_javascript_access);
|
2020-04-06 20:09:52 +00:00
|
|
|
|
2020-03-26 18:05:45 +00:00
|
|
|
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
|
2024-09-18 01:12:11 +00:00
|
|
|
index d33f1cba6f7347d855143f60ed3acbf41465176a..341fd07b9d335074eea1ba2f555666428aa2b8d0 100644
|
2020-03-26 18:05:45 +00:00
|
|
|
--- a/content/browser/web_contents/web_contents_impl.cc
|
|
|
|
+++ b/content/browser/web_contents/web_contents_impl.cc
|
2024-09-18 01:12:11 +00:00
|
|
|
@@ -4780,6 +4780,12 @@ FrameTree* WebContentsImpl::CreateNewWindow(
|
|
|
|
SetPartitionedPopinOpenerOnNewWindowIfNeeded(new_contents_impl, params,
|
|
|
|
opener);
|
2020-04-06 20:09:52 +00:00
|
|
|
|
2020-11-10 17:06:03 +00:00
|
|
|
+ if (delegate_) {
|
2020-03-26 18:05:45 +00:00
|
|
|
+ delegate_->WebContentsCreatedWithFullParams(this, render_process_id,
|
|
|
|
+ opener->GetRoutingID(),
|
|
|
|
+ params, new_contents_impl);
|
2020-11-10 17:06:03 +00:00
|
|
|
+ }
|
|
|
|
+
|
2022-12-05 22:59:19 +00:00
|
|
|
// 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
|
2024-09-18 01:12:11 +00:00
|
|
|
@@ -4821,12 +4827,6 @@ FrameTree* WebContentsImpl::CreateNewWindow(
|
2021-03-04 17:27:05 +00:00
|
|
|
AddWebContentsDestructionObserver(new_contents_impl);
|
2020-03-26 18:05:45 +00:00
|
|
|
}
|
2020-04-06 20:09:52 +00:00
|
|
|
|
2020-11-10 17:06:03 +00:00
|
|
|
- if (delegate_) {
|
|
|
|
- delegate_->WebContentsCreated(this, render_process_id,
|
|
|
|
- opener->GetRoutingID(), params.frame_name,
|
|
|
|
- params.target_url, new_contents_impl);
|
|
|
|
- }
|
|
|
|
-
|
2021-02-09 20:16:21 +00:00
|
|
|
observers_.NotifyObservers(&WebContentsObserver::DidOpenRequestedURL,
|
|
|
|
new_contents_impl, opener, params.target_url,
|
|
|
|
params.referrer.To<Referrer>(), params.disposition,
|
2018-09-14 05:02:16 +00:00
|
|
|
diff --git a/content/common/frame.mojom b/content/common/frame.mojom
|
2024-09-18 01:12:11 +00:00
|
|
|
index 61ee456a1bfb842aefd8b644ff0ae630a698ef7c..cbf4276337139a81d46fb263bce8f5ee98da39a6 100644
|
2018-09-14 05:02:16 +00:00
|
|
|
--- a/content/common/frame.mojom
|
|
|
|
+++ b/content/common/frame.mojom
|
2024-08-22 18:16:40 +00:00
|
|
|
@@ -610,6 +610,10 @@ struct CreateNewWindowParams {
|
2023-01-06 02:35:34 +00:00
|
|
|
// The navigation initiator's user activation and ad status.
|
|
|
|
blink.mojom.NavigationInitiatorActivationAndAdStatus
|
|
|
|
initiator_activation_and_ad_status;
|
2018-09-14 05:02:16 +00:00
|
|
|
+
|
|
|
|
+ // Extra fields added by Electron.
|
2020-03-26 18:05:45 +00:00
|
|
|
+ string raw_features;
|
2019-01-24 14:52:14 +00:00
|
|
|
+ network.mojom.URLRequestBody? body;
|
2018-09-14 05:02:16 +00:00
|
|
|
};
|
2020-04-06 20:09:52 +00:00
|
|
|
|
2018-09-14 05:02:16 +00:00
|
|
|
// 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
|
2024-09-18 01:12:11 +00:00
|
|
|
index 881c8f4a749033c52ee92a6f6a9dd5b3738de581..58b7797146f25692c6f7ed7b11adade941250599 100644
|
2018-09-14 05:02:16 +00:00
|
|
|
--- a/content/public/browser/content_browser_client.cc
|
|
|
|
+++ b/content/public/browser/content_browser_client.cc
|
2024-09-18 01:12:11 +00:00
|
|
|
@@ -754,6 +754,8 @@ bool ContentBrowserClient::CanCreateWindow(
|
2018-09-14 05:02:16 +00:00
|
|
|
const std::string& frame_name,
|
|
|
|
WindowOpenDisposition disposition,
|
|
|
|
const blink::mojom::WindowFeatures& features,
|
2020-03-26 18:05:45 +00:00
|
|
|
+ const std::string& raw_features,
|
2018-09-14 05:02:16 +00:00
|
|
|
+ const scoped_refptr<network::ResourceRequestBody>& body,
|
|
|
|
bool user_gesture,
|
|
|
|
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
|
2024-09-18 01:12:11 +00:00
|
|
|
index 7c435bbfc65ae370cadec0b460e347e317d00236..76f47046fdb2ef5c63c66748bc38c52713a3ed4a 100644
|
2018-09-14 05:02:16 +00:00
|
|
|
--- a/content/public/browser/content_browser_client.h
|
|
|
|
+++ b/content/public/browser/content_browser_client.h
|
2024-09-18 01:12:11 +00:00
|
|
|
@@ -191,6 +191,7 @@ class NetworkService;
|
2019-10-28 22:12:35 +00:00
|
|
|
class TrustedURLLoaderHeaderClient;
|
|
|
|
} // namespace mojom
|
|
|
|
struct ResourceRequest;
|
2018-09-14 05:02:16 +00:00
|
|
|
+class ResourceRequestBody;
|
2019-10-28 22:12:35 +00:00
|
|
|
} // namespace network
|
2020-04-06 20:09:52 +00:00
|
|
|
|
2020-06-22 17:35:10 +00:00
|
|
|
namespace sandbox {
|
2024-09-18 01:12:11 +00:00
|
|
|
@@ -1298,6 +1299,8 @@ class CONTENT_EXPORT ContentBrowserClient {
|
2018-09-14 05:02:16 +00:00
|
|
|
const std::string& frame_name,
|
|
|
|
WindowOpenDisposition disposition,
|
|
|
|
const blink::mojom::WindowFeatures& features,
|
2020-03-26 18:05:45 +00:00
|
|
|
+ const std::string& raw_features,
|
2018-09-14 05:02:16 +00:00
|
|
|
+ const scoped_refptr<network::ResourceRequestBody>& body,
|
|
|
|
bool user_gesture,
|
|
|
|
bool opener_suppressed,
|
|
|
|
bool* no_javascript_access);
|
2020-03-26 18:05:45 +00:00
|
|
|
diff --git a/content/public/browser/web_contents_delegate.cc b/content/public/browser/web_contents_delegate.cc
|
2024-09-18 01:12:11 +00:00
|
|
|
index 2fda1060616c3e0cd80ee44a7032ee0bd2117ae7..fe7d5c471cb49f91d32e1335bfaad6879ff2bd07 100644
|
2020-03-26 18:05:45 +00:00
|
|
|
--- a/content/public/browser/web_contents_delegate.cc
|
|
|
|
+++ b/content/public/browser/web_contents_delegate.cc
|
2023-11-01 23:01:01 +00:00
|
|
|
@@ -30,6 +30,17 @@ namespace content {
|
2020-04-06 20:09:52 +00:00
|
|
|
|
2020-03-26 18:05:45 +00:00
|
|
|
WebContentsDelegate::WebContentsDelegate() = default;
|
2020-04-06 20:09:52 +00:00
|
|
|
|
2020-03-26 18:05:45 +00:00
|
|
|
+void WebContentsDelegate::WebContentsCreatedWithFullParams(
|
|
|
|
+ WebContents* source_contents,
|
|
|
|
+ int opener_render_process_id,
|
|
|
|
+ int opener_render_frame_id,
|
|
|
|
+ const mojom::CreateNewWindowParams& params,
|
|
|
|
+ WebContents* new_contents) {
|
|
|
|
+ WebContentsCreated(source_contents, opener_render_process_id,
|
|
|
|
+ opener_render_frame_id, params.frame_name,
|
|
|
|
+ params.target_url, new_contents);
|
|
|
|
+}
|
|
|
|
+
|
2024-04-15 22:10:32 +00:00
|
|
|
WebContents* WebContentsDelegate::OpenURLFromTab(
|
|
|
|
WebContents* source,
|
|
|
|
const OpenURLParams& params,
|
2020-03-26 18:05:45 +00:00
|
|
|
diff --git a/content/public/browser/web_contents_delegate.h b/content/public/browser/web_contents_delegate.h
|
2024-09-18 01:12:11 +00:00
|
|
|
index 68e7d497a3ab6ab194bc5e1e28659d407492d5c7..009780aa378d473a103110496aceae7307f10f3b 100644
|
2020-03-26 18:05:45 +00:00
|
|
|
--- a/content/public/browser/web_contents_delegate.h
|
|
|
|
+++ b/content/public/browser/web_contents_delegate.h
|
2024-02-14 17:33:32 +00:00
|
|
|
@@ -17,6 +17,7 @@
|
2021-03-16 14:01:00 +00:00
|
|
|
#include "base/memory/scoped_refptr.h"
|
2020-03-26 18:05:45 +00:00
|
|
|
#include "build/build_config.h"
|
|
|
|
#include "content/common/content_export.h"
|
|
|
|
+#include "content/common/frame.mojom.h"
|
2024-08-12 08:28:33 +00:00
|
|
|
#include "content/public/browser/back_forward_transition_animation_manager.h"
|
2020-05-26 20:06:26 +00:00
|
|
|
#include "content/public/browser/eye_dropper.h"
|
2023-03-10 16:07:42 +00:00
|
|
|
#include "content/public/browser/fullscreen_types.h"
|
2024-09-18 01:12:11 +00:00
|
|
|
@@ -365,6 +366,13 @@ class CONTENT_EXPORT WebContentsDelegate {
|
2022-02-25 18:17:35 +00:00
|
|
|
const StoragePartitionConfig& partition_config,
|
2020-03-26 18:05:45 +00:00
|
|
|
SessionStorageNamespace* session_storage_namespace);
|
2020-04-06 20:09:52 +00:00
|
|
|
|
2020-03-26 18:05:45 +00:00
|
|
|
+ virtual void WebContentsCreatedWithFullParams(
|
|
|
|
+ WebContents* source_contents,
|
|
|
|
+ int opener_render_process_id,
|
|
|
|
+ int opener_render_frame_id,
|
|
|
|
+ const mojom::CreateNewWindowParams& params,
|
|
|
|
+ WebContents* new_contents);
|
|
|
|
+
|
|
|
|
// Notifies the delegate about the creation of a new WebContents. This
|
|
|
|
// typically happens when popups are created.
|
|
|
|
virtual void WebContentsCreated(WebContents* source_contents,
|
2022-09-07 07:46:37 +00:00
|
|
|
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
|
2024-09-18 01:12:11 +00:00
|
|
|
index 99b7d7116fe22bbdfdcdcaae8f09288fe25549e4..1fd800fe2d56c510aed0d532dc3d370538da348f 100644
|
2022-09-07 07:46:37 +00:00
|
|
|
--- a/content/renderer/render_frame_impl.cc
|
|
|
|
+++ b/content/renderer/render_frame_impl.cc
|
2024-09-18 01:12:11 +00:00
|
|
|
@@ -6763,6 +6763,10 @@ WebView* RenderFrameImpl::CreateNewWindow(
|
2023-07-18 22:26:27 +00:00
|
|
|
request.HasUserGesture(), GetWebFrame()->IsAdFrame(),
|
|
|
|
GetWebFrame()->IsAdScriptInStack());
|
2021-02-09 20:16:21 +00:00
|
|
|
|
2020-03-26 18:05:45 +00:00
|
|
|
+ params->raw_features = features.raw_features.Utf8(
|
|
|
|
+ WTF::UTF8ConversionMode::kStrictUTF8ConversionReplacingUnpairedSurrogatesWithFFFD);
|
2019-01-24 14:52:14 +00:00
|
|
|
+ params->body = GetRequestBodyForWebURLRequest(request);
|
2021-02-09 20:16:21 +00:00
|
|
|
+
|
2022-06-01 06:12:47 +00:00
|
|
|
// We preserve this information before sending the message since |params| is
|
|
|
|
// moved on send.
|
|
|
|
bool is_background_tab =
|
2020-09-21 08:00:36 +00:00
|
|
|
diff --git a/content/web_test/browser/web_test_content_browser_client.cc b/content/web_test/browser/web_test_content_browser_client.cc
|
2024-08-12 17:47:27 +00:00
|
|
|
index 207c7298ffb187354d4a50dad421fe78f9bc066d..10bae4861c9cac9d2c9cedae8beca16f2c4c5f5a 100644
|
2020-09-21 08:00:36 +00:00
|
|
|
--- a/content/web_test/browser/web_test_content_browser_client.cc
|
|
|
|
+++ b/content/web_test/browser/web_test_content_browser_client.cc
|
2024-08-12 17:47:27 +00:00
|
|
|
@@ -520,6 +520,8 @@ bool WebTestContentBrowserClient::CanCreateWindow(
|
2018-09-14 05:02:16 +00:00
|
|
|
const std::string& frame_name,
|
|
|
|
WindowOpenDisposition disposition,
|
|
|
|
const blink::mojom::WindowFeatures& features,
|
2020-03-26 18:05:45 +00:00
|
|
|
+ const std::string& raw_features,
|
2018-09-14 05:02:16 +00:00
|
|
|
+ const scoped_refptr<network::ResourceRequestBody>& body,
|
|
|
|
bool user_gesture,
|
|
|
|
bool opener_suppressed,
|
|
|
|
bool* no_javascript_access) {
|
2020-09-21 08:00:36 +00:00
|
|
|
diff --git a/content/web_test/browser/web_test_content_browser_client.h b/content/web_test/browser/web_test_content_browser_client.h
|
2024-07-29 13:37:35 +00:00
|
|
|
index 115b75966f53ee16f7886fc4152741727c7825c8..a1944f7de539f04f85fdb238ccf67e091f413ad3 100644
|
2020-09-21 08:00:36 +00:00
|
|
|
--- a/content/web_test/browser/web_test_content_browser_client.h
|
|
|
|
+++ b/content/web_test/browser/web_test_content_browser_client.h
|
2024-07-29 13:37:35 +00:00
|
|
|
@@ -92,6 +92,8 @@ class WebTestContentBrowserClient : public ShellContentBrowserClient {
|
2018-09-14 05:02:16 +00:00
|
|
|
const std::string& frame_name,
|
|
|
|
WindowOpenDisposition disposition,
|
|
|
|
const blink::mojom::WindowFeatures& features,
|
2020-03-26 18:05:45 +00:00
|
|
|
+ const std::string& raw_features,
|
2018-09-14 05:02:16 +00:00
|
|
|
+ const scoped_refptr<network::ResourceRequestBody>& body,
|
|
|
|
bool user_gesture,
|
|
|
|
bool opener_suppressed,
|
|
|
|
bool* no_javascript_access) override;
|
2020-03-26 18:05:45 +00:00
|
|
|
diff --git a/third_party/blink/public/web/web_window_features.h b/third_party/blink/public/web/web_window_features.h
|
2024-08-19 18:52:53 +00:00
|
|
|
index c576ace24e81cc877aa2595d40e0a13a7af9f6a2..210fb97d44c19c29af424cc7b9cb31690cfcc565 100644
|
2020-03-26 18:05:45 +00:00
|
|
|
--- a/third_party/blink/public/web/web_window_features.h
|
|
|
|
+++ b/third_party/blink/public/web/web_window_features.h
|
2024-02-14 17:33:32 +00:00
|
|
|
@@ -35,6 +35,7 @@
|
|
|
|
|
2023-04-13 01:10:31 +00:00
|
|
|
#include "third_party/blink/public/platform/web_string.h"
|
2023-05-10 14:47:48 +00:00
|
|
|
#include "third_party/blink/public/platform/web_vector.h"
|
2020-03-26 18:05:45 +00:00
|
|
|
+#include "third_party/blink/renderer/platform/wtf/text/wtf_string.h"
|
2021-05-05 23:26:17 +00:00
|
|
|
|
2020-03-26 18:05:45 +00:00
|
|
|
namespace blink {
|
2020-04-06 20:09:52 +00:00
|
|
|
|
2024-08-19 18:52:53 +00:00
|
|
|
@@ -74,6 +75,8 @@ struct WebWindowFeatures {
|
2023-05-10 14:47:48 +00:00
|
|
|
// TODO(apaseltiner): Investigate moving this field to a non-public struct
|
|
|
|
// since it is only needed within //third_party/blink.
|
2024-02-14 17:33:32 +00:00
|
|
|
std::optional<WebVector<WebString>> attribution_srcs;
|
2020-03-26 18:05:45 +00:00
|
|
|
+
|
|
|
|
+ String raw_features;
|
|
|
|
};
|
2020-04-06 20:09:52 +00:00
|
|
|
|
2020-03-26 18:05:45 +00:00
|
|
|
} // 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
|
2024-09-18 01:12:11 +00:00
|
|
|
index 253ed56239fba6a2078031fa81a0bdc4ab16953d..e0fb3774ccbe4055a44866be6de282b76cfe556d 100644
|
2020-03-26 18:05:45 +00:00
|
|
|
--- a/third_party/blink/renderer/core/frame/local_dom_window.cc
|
|
|
|
+++ b/third_party/blink/renderer/core/frame/local_dom_window.cc
|
2024-09-18 01:12:11 +00:00
|
|
|
@@ -2248,6 +2248,8 @@ DOMWindow* LocalDOMWindow::open(v8::Isolate* isolate,
|
2021-05-05 23:26:17 +00:00
|
|
|
WebWindowFeatures window_features =
|
2023-04-13 01:10:31 +00:00
|
|
|
GetWindowFeaturesFromString(features, entered_window);
|
2024-08-22 18:16:40 +00:00
|
|
|
|
2024-08-26 19:09:33 +00:00
|
|
|
+ window_features.raw_features = features;
|
|
|
|
+
|
2024-09-18 01:12:11 +00:00
|
|
|
if (window_features.is_partitioned_popin) {
|
|
|
|
UseCounter::Count(*entered_window,
|
|
|
|
WebFeature::kPartitionedPopin_OpenAttempt);
|