123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233 |
- 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 551e75bc26a88206e8af9868163cd5818ebc33e1..19d944da98817b253117c6436099ab4dc7250edb 100644
- --- a/content/browser/renderer_host/render_frame_host_impl.cc
- +++ b/content/browser/renderer_host/render_frame_host_impl.cc
- @@ -6505,6 +6505,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 818585d3aca6dce4daff03e68f23266ef1c85a9a..d3145c4dc21e6e47915a5b96224972f70b633fda 100644
- --- a/content/browser/web_contents/web_contents_impl.cc
- +++ b/content/browser/web_contents/web_contents_impl.cc
- @@ -3753,6 +3753,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_id, session_storage_namespace);
-
- @@ -3795,12 +3803,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 268a2395423ebcd1eded3d8ead5f7775cd5895be..c0cad20dc8273576dea2a9f3fe0c67be101a2193 100644
- --- a/content/common/frame.mojom
- +++ b/content/common/frame.mojom
- @@ -550,6 +550,10 @@ struct CreateNewWindowParams {
-
- // Governs how downloads are handled if `target_url` results in a download.
- blink.mojom.NavigationDownloadPolicy download_policy;
- +
- + // 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 248a90c7682001296d623eb80e925f03360a5510..bd15404a10db2f4641763da260a84bb76d3739ab 100644
- --- a/content/public/browser/content_browser_client.cc
- +++ b/content/public/browser/content_browser_client.cc
- @@ -569,6 +569,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 7dfc30f346a9420be631c466ffa2d8b8adabf556..f0e2a061bb35fd3db26c7d235e1196273036925f 100644
- --- a/content/public/browser/content_browser_client.h
- +++ b/content/public/browser/content_browser_client.h
- @@ -168,6 +168,7 @@ class NetworkService;
- class TrustedURLLoaderHeaderClient;
- } // namespace mojom
- struct ResourceRequest;
- +class ResourceRequestBody;
- } // namespace network
-
- namespace sandbox {
- @@ -936,6 +937,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 4a57554c9e540516af83567183a34384ac722ebf..31c73efb73bb69076abd6b9c4f139072a9f7f603 100644
- --- a/content/public/browser/web_contents_delegate.cc
- +++ b/content/public/browser/web_contents_delegate.cc
- @@ -28,6 +28,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 a0da74d5cbe4ab8be84d6f1a92f444e858320745..5936fa4bce09895595ccb294504f5b89c967d8c0 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"
- @@ -335,6 +336,13 @@ class CONTENT_EXPORT WebContentsDelegate {
- const StoragePartitionId& partition_id,
- 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_view_impl.cc b/content/renderer/render_view_impl.cc
- index ea22a86dc1a6e5cdb3e3dfa31a929a3dd14b9e61..215b059bb2dfcead6c709c99b39578f8e2216d93 100644
- --- a/content/renderer/render_view_impl.cc
- +++ b/content/renderer/render_view_impl.cc
- @@ -31,6 +31,7 @@
- #include "third_party/blink/public/platform/impression_conversions.h"
- #include "third_party/blink/public/platform/modules/video_capture/web_video_capture_impl_manager.h"
- #include "third_party/blink/public/platform/url_conversion.h"
- +#include "third_party/blink/public/platform/web_url_request_util.h"
- #include "third_party/blink/public/web/modules/mediastream/web_media_stream_device_observer.h"
- #include "third_party/blink/public/web/web_frame_widget.h"
- #include "third_party/blink/public/web/web_local_frame.h"
- @@ -289,6 +290,10 @@ WebView* RenderViewImpl::CreateView(
- params->impression = blink::ConvertWebImpressionToImpression(*impression);
- }
-
- + params->raw_features = features.raw_features.Utf8(
- + WTF::UTF8ConversionMode::kStrictUTF8ConversionReplacingUnpairedSurrogatesWithFFFD);
- + params->body = GetRequestBodyForWebURLRequest(request);
- +
- params->download_policy.ApplyDownloadFramePolicy(
- /*is_opener_navigation=*/false, request.HasUserGesture(),
- // `openee_can_access_opener_origin` only matters for opener navigations,
- 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 520b6f8146361cf8c00079c1cc0f5394f747d405..77f58cc157229eb01ce9a35aa5814f64d6e8f2f2 100644
- --- a/content/web_test/browser/web_test_content_browser_client.cc
- +++ b/content/web_test/browser/web_test_content_browser_client.cc
- @@ -438,6 +438,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 1580bd13ea123740dc7a8813680a8d2448d49969..5c0809733b366ecff02c5a4b77dac9530eb15fbf 100644
- --- a/content/web_test/browser/web_test_content_browser_client.h
- +++ b/content/web_test/browser/web_test_content_browser_client.h
- @@ -80,6 +80,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 84d32491a56528a84b4395fba1d54cdbb38d522b..09998a83c449ef8cd9f360fbcdcf7edc0bbfa4a9 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/platform/web_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<WebImpression> 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 1cab0b95a9f828791188ca6ad3adb416f864e008..f8ec60fae8eabda4019dd9f6903bfcbf00d423ce 100644
- --- a/third_party/blink/renderer/core/frame/local_dom_window.cc
- +++ b/third_party/blink/renderer/core/frame/local_dom_window.cc
- @@ -2030,6 +2030,7 @@ DOMWindow* LocalDOMWindow::open(v8::Isolate* isolate,
-
- WebWindowFeatures window_features =
- GetWindowFeaturesFromString(features, incumbent_window);
- + window_features.raw_features = features;
-
- FrameLoadRequest frame_request(incumbent_window,
- ResourceRequest(completed_url));
|