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 491c8b441dfe84862c8b0caa7941cc1e7d16e331..74b3fb5010895869b606890f1523512cd2ee96af 100644
- --- a/content/browser/renderer_host/render_frame_host_impl.cc
- +++ b/content/browser/renderer_host/render_frame_host_impl.cc
- @@ -5979,6 +5979,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 e3146d7cfdfb1f1856edba2e371a8b7589b627a1..952c073cfb1a2385581759b29683f1b66564d99b 100644
- --- a/content/browser/web_contents/web_contents_impl.cc
- +++ b/content/browser/web_contents/web_contents_impl.cc
- @@ -3774,6 +3774,14 @@ RenderFrameHostDelegate* 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);
-
- @@ -3816,12 +3824,6 @@ RenderFrameHostDelegate* 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 542a9bb6343b16c4dfe3aebae97ec06073021e52..840d562fcc8e0da12393924d56c2a6f319be9006 100644
- --- a/content/common/frame.mojom
- +++ b/content/common/frame.mojom
- @@ -468,6 +468,10 @@ struct CreateNewWindowParams {
- // The impression associated with the navigation in the new window, if
- // one is specified.
- Impression? impression;
- +
- + // 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 09597633dfd443376784d8645611ab18a903bf23..1fe182db87390b346fa03091dcc177611943d70e 100644
- --- a/content/public/browser/content_browser_client.cc
- +++ b/content/public/browser/content_browser_client.cc
- @@ -566,6 +566,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 7dd2b78088759ffdd80c33cd529adbb93215334f..5ec83c0a56fc91d3c13d97dd8c58a286b6358146 100644
- --- a/content/public/browser/content_browser_client.h
- +++ b/content/public/browser/content_browser_client.h
- @@ -160,6 +160,7 @@ class NetworkService;
- class TrustedURLLoaderHeaderClient;
- } // namespace mojom
- struct ResourceRequest;
- +class ResourceRequestBody;
- } // namespace network
-
- namespace sandbox {
- @@ -937,6 +938,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 8ba5d82ebb39b495a0c175c771be8c4f071b5052..cf2974dad890e61e4090d3328b23de203838bd7c 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 8a3c4c24a55ae7c520514ded527eb6214a5708a9..631c9b3aab0f2dfe8e6d8437b3f31676e8e158b5 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"
- @@ -340,6 +341,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 a229509d7254f87af5128ffdaad4cd9c74c3e980..766adb31cf654ff964fbca3acc941c092e382448 100644
- --- a/content/renderer/render_view_impl.cc
- +++ b/content/renderer/render_view_impl.cc
- @@ -26,6 +26,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"
- @@ -284,6 +285,10 @@ WebView* RenderViewImpl::CreateView(
- params->impression = blink::ConvertWebImpressionToImpression(*impression);
- }
-
- + 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 e3dd040164fec1a70c9bd2dac7cc3d93478ec39f..f8894682e181a99b9e6cf3d0e4b46413076eb5ef 100644
- --- a/content/web_test/browser/web_test_content_browser_client.cc
- +++ b/content/web_test/browser/web_test_content_browser_client.cc
- @@ -450,6 +450,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 c65d30c9187dd275488ed74bcc3a4eb918d2cbce..e4c6c828150e91f555b1b42e1988a1013ab1a1f0 100644
- --- a/content/web_test/browser/web_test_content_browser_client.h
- +++ b/content/web_test/browser/web_test_content_browser_client.h
- @@ -83,6 +83,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 06983193aa144c526b606c6b1291b2271a4570b3..cf2bc64ee509727570cc55a08dcdb39d3f18cce9 100644
- --- a/third_party/blink/renderer/core/frame/local_dom_window.cc
- +++ b/third_party/blink/renderer/core/frame/local_dom_window.cc
- @@ -1989,6 +1989,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));
|