123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226 |
- From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
- From: Cheng Zhao <[email protected]>
- Date: Thu, 20 Sep 2018 17:45:32 -0700
- Subject: can_create_window.patch
- 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.
- diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
- index 1c652afe8b002635b34d6718c8c69cdd86dd9f8b..21eb439646c16aa72e78e9436006a29cbd8c5bf4 100644
- --- a/content/browser/renderer_host/render_frame_host_impl.cc
- +++ b/content/browser/renderer_host/render_frame_host_impl.cc
- @@ -7344,6 +7344,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,
- + params->raw_features, params->body,
- effective_transient_activation_state, params->opener_suppressed,
- &no_javascript_access);
-
- diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
- index abb91fd00245fddf49ee8d28be081a041aa9fce9..707d9a116c8ea119977b54d3a3365d96fef05a5a 100644
- --- a/content/browser/web_contents/web_contents_impl.cc
- +++ b/content/browser/web_contents/web_contents_impl.cc
- @@ -4005,6 +4005,14 @@ FrameTree* WebContentsImpl::CreateNewWindow(
- }
- auto* new_contents_impl = new_contents.get();
-
- + // Call this earlier than Chrome to associate the web preferences with the
- + // WebContents before the view gets created.
- + if (delegate_) {
- + delegate_->WebContentsCreatedWithFullParams(this, render_process_id,
- + opener->GetRoutingID(),
- + params, new_contents_impl);
- + }
- +
- new_contents_impl->GetController().SetSessionStorageNamespace(
- partition_config, session_storage_namespace);
-
- @@ -4049,12 +4057,6 @@ FrameTree* WebContentsImpl::CreateNewWindow(
- AddWebContentsDestructionObserver(new_contents_impl);
- }
-
- - if (delegate_) {
- - delegate_->WebContentsCreated(this, render_process_id,
- - opener->GetRoutingID(), params.frame_name,
- - params.target_url, new_contents_impl);
- - }
- -
- observers_.NotifyObservers(&WebContentsObserver::DidOpenRequestedURL,
- new_contents_impl, opener, params.target_url,
- params.referrer.To<Referrer>(), params.disposition,
- diff --git a/content/common/frame.mojom b/content/common/frame.mojom
- index 4eee5f6c069c83039bf0acee71056d8ed4ea92eb..9212926fba9d06296c9c46a95519b6ed777569ee 100644
- --- a/content/common/frame.mojom
- +++ b/content/common/frame.mojom
- @@ -574,6 +574,10 @@ struct CreateNewWindowParams {
-
- // Additional parameters for creating picture-in-picture windows.
- blink.mojom.PictureInPictureWindowOptions? pip_options;
- +
- + // Extra fields added by Electron.
- + string raw_features;
- + network.mojom.URLRequestBody? body;
- };
-
- // 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 1e6bbfd6e7d79d1d75bd590fd2040ce51d330f16..3154a7ea00daa120279c34bdb5799b278e73ac62 100644
- --- a/content/public/browser/content_browser_client.cc
- +++ b/content/public/browser/content_browser_client.cc
- @@ -617,6 +617,8 @@ bool ContentBrowserClient::CanCreateWindow(
- const std::string& frame_name,
- WindowOpenDisposition disposition,
- const blink::mojom::WindowFeatures& features,
- + const std::string& raw_features,
- + 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
- index b4d22a849e067bb942825449e649a4a00fc4947a..67a8cbf589693a0a347f6604a36ed2a39d4ef2da 100644
- --- a/content/public/browser/content_browser_client.h
- +++ b/content/public/browser/content_browser_client.h
- @@ -163,6 +163,7 @@ class NetworkService;
- class TrustedURLLoaderHeaderClient;
- } // namespace mojom
- struct ResourceRequest;
- +class ResourceRequestBody;
- } // namespace network
-
- namespace sandbox {
- @@ -1003,6 +1004,8 @@ class CONTENT_EXPORT ContentBrowserClient {
- const std::string& frame_name,
- WindowOpenDisposition disposition,
- const blink::mojom::WindowFeatures& features,
- + const std::string& raw_features,
- + const scoped_refptr<network::ResourceRequestBody>& body,
- bool user_gesture,
- bool opener_suppressed,
- bool* no_javascript_access);
- diff --git a/content/public/browser/web_contents_delegate.cc b/content/public/browser/web_contents_delegate.cc
- index 74847a4fbd4d0d897ce6aecd1b39e30bc226f8f4..3ddcc2d403a68fdc2b4b0246899cd9507ecc6195 100644
- --- a/content/public/browser/web_contents_delegate.cc
- +++ b/content/public/browser/web_contents_delegate.cc
- @@ -26,6 +26,17 @@ namespace content {
-
- WebContentsDelegate::WebContentsDelegate() = default;
-
- +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);
- +}
- +
- WebContents* WebContentsDelegate::OpenURLFromTab(WebContents* source,
- const OpenURLParams& params) {
- return nullptr;
- diff --git a/content/public/browser/web_contents_delegate.h b/content/public/browser/web_contents_delegate.h
- index 815bee280776026f477c695d31cff8e040e25a49..04eff05d01eb94e5020cdd6e1cc2555077692ba0 100644
- --- a/content/public/browser/web_contents_delegate.h
- +++ b/content/public/browser/web_contents_delegate.h
- @@ -16,6 +16,7 @@
- #include "base/memory/scoped_refptr.h"
- #include "build/build_config.h"
- #include "content/common/content_export.h"
- +#include "content/common/frame.mojom.h"
- #include "content/public/browser/eye_dropper.h"
- #include "content/public/browser/invalidate_type.h"
- #include "content/public/browser/media_stream_request.h"
- @@ -341,6 +342,13 @@ class CONTENT_EXPORT WebContentsDelegate {
- const StoragePartitionConfig& partition_config,
- SessionStorageNamespace* session_storage_namespace);
-
- + 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,
- diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
- index 34a64f22b7e6f834409e3afdb243943af370b21d..36b3f9d6d535e1fde2cf3496dabcac07c372b892 100644
- --- a/content/renderer/render_frame_impl.cc
- +++ b/content/renderer/render_frame_impl.cc
- @@ -6201,6 +6201,10 @@ WebView* RenderFrameImpl::CreateNewWindow(
- /*openee_can_access_opener_origin=*/true,
- !GetWebFrame()->IsAllowedToDownload(), GetWebFrame()->IsAdFrame());
-
- + params->raw_features = features.raw_features.Utf8(
- + WTF::UTF8ConversionMode::kStrictUTF8ConversionReplacingUnpairedSurrogatesWithFFFD);
- + params->body = GetRequestBodyForWebURLRequest(request);
- +
- // We preserve this information before sending the message since |params| is
- // 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 40b82385697d8721ef6da3d0c77544d6d0ca400c..3a2d5207fb2eeea4b016012b09c3668af8dc35b4 100644
- --- a/content/web_test/browser/web_test_content_browser_client.cc
- +++ b/content/web_test/browser/web_test_content_browser_client.cc
- @@ -482,6 +482,8 @@ bool WebTestContentBrowserClient::CanCreateWindow(
- const std::string& frame_name,
- WindowOpenDisposition disposition,
- const blink::mojom::WindowFeatures& features,
- + const std::string& raw_features,
- + const scoped_refptr<network::ResourceRequestBody>& body,
- bool user_gesture,
- bool opener_suppressed,
- bool* no_javascript_access) {
- diff --git a/content/web_test/browser/web_test_content_browser_client.h b/content/web_test/browser/web_test_content_browser_client.h
- index 4805dd035772fcaea60a1a91eb9911d5c0ce93a9..3b752ea509149f04fd6d10f6977bd29791f6a5d6 100644
- --- a/content/web_test/browser/web_test_content_browser_client.h
- +++ b/content/web_test/browser/web_test_content_browser_client.h
- @@ -81,6 +81,8 @@ class WebTestContentBrowserClient : public ShellContentBrowserClient {
- const std::string& frame_name,
- WindowOpenDisposition disposition,
- const blink::mojom::WindowFeatures& features,
- + const std::string& raw_features,
- + const scoped_refptr<network::ResourceRequestBody>& body,
- bool user_gesture,
- bool opener_suppressed,
- bool* no_javascript_access) override;
- diff --git a/third_party/blink/public/web/web_window_features.h b/third_party/blink/public/web/web_window_features.h
- index 34570168ccb123f5102dcf8fa6bbf98e7c373ec6..192701e56d258da41b3724292853885e4daf3420 100644
- --- a/third_party/blink/public/web/web_window_features.h
- +++ b/third_party/blink/public/web/web_window_features.h
- @@ -34,6 +34,7 @@
- #include "third_party/abseil-cpp/absl/types/optional.h"
-
- #include "third_party/blink/public/common/navigation/impression.h"
- +#include "third_party/blink/renderer/platform/wtf/text/wtf_string.h"
-
- namespace blink {
-
- @@ -68,6 +69,8 @@ struct WebWindowFeatures {
- // Represents the attribution source declared by Attribution Reporting related
- // window features, if any.
- absl::optional<Impression> impression;
- +
- + String raw_features;
- };
-
- } // 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 496610b02adf00eee937ffb42e5e6461df847441..ad9d8b199c32c189982fbed3ab6b9ae04c5ff968 100644
- --- a/third_party/blink/renderer/core/frame/local_dom_window.cc
- +++ b/third_party/blink/renderer/core/frame/local_dom_window.cc
- @@ -2108,6 +2108,8 @@ DOMWindow* LocalDOMWindow::open(v8::Isolate* isolate,
- WebWindowFeatures window_features =
- GetWindowFeaturesFromString(features, entered_window, completed_url);
-
- + window_features.raw_features = features;
- +
- // In fenced frames, we should always use `noopener`.
- if (GetFrame()->IsInFencedFrameTree()) {
- window_features.noopener = true;
|