123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224 |
- 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 a28f1825107b411e17a2a7e5fac38488afef0d37..999282378d149cb813ce615ba7bd59dbf888ffd1 100644
- --- a/content/browser/renderer_host/render_frame_host_impl.cc
- +++ b/content/browser/renderer_host/render_frame_host_impl.cc
- @@ -9403,6 +9403,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 9c957e02ff49742cc70c71316c2c695334317d0e..f9eddb8d8f482789da3d74abd298f7b39acea386 100644
- --- a/content/browser/web_contents/web_contents_impl.cc
- +++ b/content/browser/web_contents/web_contents_impl.cc
- @@ -4976,6 +4976,12 @@ FrameTree* WebContentsImpl::CreateNewWindow(
- SetPartitionedPopinOpenerOnNewWindowIfNeeded(new_contents_impl, params,
- opener);
-
- + if (delegate_) {
- + delegate_->WebContentsCreatedWithFullParams(this, render_process_id,
- + opener->GetRoutingID(),
- + params, new_contents_impl);
- + }
- +
- // 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
- @@ -5017,12 +5023,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 91dcf6c9c4a2d840fb50cb329fe3ef1bba9103c3..cbc887a3034605a93468e73a310e9ca6838b32d8 100644
- --- a/content/common/frame.mojom
- +++ b/content/common/frame.mojom
- @@ -621,6 +621,10 @@ struct CreateNewWindowParams {
- // The navigation initiator's user activation and ad status.
- blink.mojom.NavigationInitiatorActivationAndAdStatus
- initiator_activation_and_ad_status;
- +
- + // 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 868f15b1f5ee0620115530653fca29283d34eced..1b060732595198cb652ae00c9787b02772fdb61c 100644
- --- a/content/public/browser/content_browser_client.cc
- +++ b/content/public/browser/content_browser_client.cc
- @@ -801,6 +801,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 d39a4763b4b67b1adc84a0090aba88b7ae7ae4cd..7988eae8421eb3c9079e449b25da2f9e52c31ffc 100644
- --- a/content/public/browser/content_browser_client.h
- +++ b/content/public/browser/content_browser_client.h
- @@ -203,6 +203,7 @@ class NetworkService;
- class TrustedURLLoaderHeaderClient;
- } // namespace mojom
- struct ResourceRequest;
- +class ResourceRequestBody;
- } // namespace network
-
- namespace sandbox {
- @@ -1357,6 +1358,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 210854ca740d53d62d53dcc48af813a510f46fbc..01fdc6dd78c2238b634d78f5d7be45577cd18878 100644
- --- a/content/public/browser/web_contents_delegate.cc
- +++ b/content/public/browser/web_contents_delegate.cc
- @@ -31,6 +31,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,
- diff --git a/content/public/browser/web_contents_delegate.h b/content/public/browser/web_contents_delegate.h
- index 6f8cb1cafde354923f494c1151169e916735de7f..375d5b8c8046b66aff9c7b5e482c347e4820603e 100644
- --- a/content/public/browser/web_contents_delegate.h
- +++ b/content/public/browser/web_contents_delegate.h
- @@ -18,6 +18,7 @@
- #include "base/types/expected.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/fullscreen_types.h"
- #include "content/public/browser/invalidate_type.h"
- @@ -366,6 +367,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 4db85df1bd41ed1c9220a42cf1db57d9241e5817..d86148672f36ecc42f4635d61cf474f6e9348ada 100644
- --- a/content/renderer/render_frame_impl.cc
- +++ b/content/renderer/render_frame_impl.cc
- @@ -6891,6 +6891,10 @@ WebView* RenderFrameImpl::CreateNewWindow(
- request.HasUserGesture(), GetWebFrame()->IsAdFrame(),
- GetWebFrame()->IsAdScriptInStack());
-
- + params->raw_features = features.raw_features.Utf8(
- + WTF::Utf8ConversionMode::kStrictReplacingErrors);
- + 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 3735a52cfd6d4fcd19a59507eda7ed4349aa0b38..cc6bf491b88a404e489e445e50d3bbe33c602204 100644
- --- a/content/web_test/browser/web_test_content_browser_client.cc
- +++ b/content/web_test/browser/web_test_content_browser_client.cc
- @@ -524,6 +524,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 e6212744a71fffa8aec3244e336eca0a38acab8b..537bde0bdd836183f90a8d44e911d508fb5f396d 100644
- --- a/content/web_test/browser/web_test_content_browser_client.h
- +++ b/content/web_test/browser/web_test_content_browser_client.h
- @@ -93,6 +93,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 82e9d3dfb5f7da76d89fe15ae61d379fa46e177d..fd035512099a54dff6cc951a2226c23a252a90e2 100644
- --- a/third_party/blink/public/web/web_window_features.h
- +++ b/third_party/blink/public/web/web_window_features.h
- @@ -35,6 +35,7 @@
- #include <vector>
-
- #include "third_party/blink/public/platform/web_string.h"
- +#include "third_party/blink/renderer/platform/wtf/text/wtf_string.h"
-
- namespace blink {
-
- @@ -74,6 +75,8 @@ struct WebWindowFeatures {
- // TODO(apaseltiner): Investigate moving this field to a non-public struct
- // since it is only needed within //third_party/blink.
- std::optional<std::vector<WebString>> attribution_srcs;
- +
- + 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 845b836a0b57d496253dbb966d2b759c08635381..af981e5269ebb4e61c25db84f20068aeb95b03af 100644
- --- a/third_party/blink/renderer/core/frame/local_dom_window.cc
- +++ b/third_party/blink/renderer/core/frame/local_dom_window.cc
- @@ -2264,6 +2264,8 @@ DOMWindow* LocalDOMWindow::open(v8::Isolate* isolate,
- WebWindowFeatures window_features =
- GetWindowFeaturesFromString(features, entered_window);
-
- + window_features.raw_features = features;
- +
- if (window_features.is_partitioned_popin) {
- UseCounter::Count(*entered_window,
- WebFeature::kPartitionedPopin_OpenAttempt);
|