|
@@ -9,10 +9,10 @@ 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 86c862dd1976a77fcfd70a44ef63839a4b4c70e8..744715d8ecc1ddca8400ae88e115e52797df1ffa 100644
|
|
|
+index ea7a56f9ebab820bc50167d1f6848078d59f4737..e0708cae6968c14f912bac9c8c7ff90344454237 100644
|
|
|
--- a/content/browser/renderer_host/render_frame_host_impl.cc
|
|
|
+++ b/content/browser/renderer_host/render_frame_host_impl.cc
|
|
|
-@@ -9067,6 +9067,7 @@ void RenderFrameHostImpl::CreateNewWindow(
|
|
|
+@@ -9104,6 +9104,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,
|
|
@@ -66,7 +66,7 @@ index 61ee456a1bfb842aefd8b644ff0ae630a698ef7c..cbf4276337139a81d46fb263bce8f5ee
|
|
|
|
|
|
// 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 9848ac58da8a0918d04bb4bb6f1d76da36ab8078..491963b39a0140193915480373371f162e2d370f 100644
|
|
|
+index e73432790e5bbd03dc3eb2a2d8c89d77d21430cc..5f60458d39e3554832b63c201e79633cf0219951 100644
|
|
|
--- a/content/public/browser/content_browser_client.cc
|
|
|
+++ b/content/public/browser/content_browser_client.cc
|
|
|
@@ -760,6 +760,8 @@ bool ContentBrowserClient::CanCreateWindow(
|
|
@@ -79,7 +79,7 @@ index 9848ac58da8a0918d04bb4bb6f1d76da36ab8078..491963b39a0140193915480373371f16
|
|
|
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 2831b0d6a44e1def69f2bc02d7daf0074acca6f4..58fd2cea8a602832e56ac5962fbac57b5adae610 100644
|
|
|
+index 7326a96f8b615e7dd7f5077faab98a6a198209bd..ff16736f47ad642211ee21b44479c5e449acf33f 100644
|
|
|
--- a/content/public/browser/content_browser_client.h
|
|
|
+++ b/content/public/browser/content_browser_client.h
|
|
|
@@ -196,6 +196,7 @@ class NetworkService;
|
|
@@ -148,10 +148,10 @@ index 294dc13ec8f27875c28b459b56b166f2c8f4a2ff..1a58077807de673e1937f3323c8dc37b
|
|
|
// 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 f6bcea8a136fa3095e536e3b2e74b10d086d41c4..cebf0f03646ebc118be4ff2c7b92b8e9f3e51962 100644
|
|
|
+index 1fd3487243760d5a64bcd27f7022d8d0326bab65..21ecced6578552e30c1a01841053f679355b7729 100644
|
|
|
--- a/content/renderer/render_frame_impl.cc
|
|
|
+++ b/content/renderer/render_frame_impl.cc
|
|
|
-@@ -6855,6 +6855,10 @@ WebView* RenderFrameImpl::CreateNewWindow(
|
|
|
+@@ -6858,6 +6858,10 @@ WebView* RenderFrameImpl::CreateNewWindow(
|
|
|
request.HasUserGesture(), GetWebFrame()->IsAdFrame(),
|
|
|
GetWebFrame()->IsAdScriptInStack());
|
|
|
|
|
@@ -163,7 +163,7 @@ index f6bcea8a136fa3095e536e3b2e74b10d086d41c4..cebf0f03646ebc118be4ff2c7b92b8e9
|
|
|
// 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 91d731a33bb48a9b7432b1139bd52e777d1e1967..d5dc4514f16063314afe1847bb64b0d5e43f5d92 100644
|
|
|
+index 9e564b2be92aefc2b58617de92dd8d519c3c784f..bf096ab972cc945d19473cc1e55f6f7fc9618778 100644
|
|
|
--- a/content/web_test/browser/web_test_content_browser_client.cc
|
|
|
+++ b/content/web_test/browser/web_test_content_browser_client.cc
|
|
|
@@ -520,6 +520,8 @@ bool WebTestContentBrowserClient::CanCreateWindow(
|
|
@@ -176,7 +176,7 @@ index 91d731a33bb48a9b7432b1139bd52e777d1e1967..d5dc4514f16063314afe1847bb64b0d5
|
|
|
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 00cbe48de3b874215f2896940d71c6ed5bed98b5..8937c40d8bffbf09c8b0c33524086d16dbbee57a 100644
|
|
|
+index 4145d0d32ca1d1f02620a66f2437eaa58954b4d7..3cb5faab3f2e60d919dd7dd76fd320b8c63de84f 100644
|
|
|
--- a/content/web_test/browser/web_test_content_browser_client.h
|
|
|
+++ b/content/web_test/browser/web_test_content_browser_client.h
|
|
|
@@ -92,6 +92,8 @@ class WebTestContentBrowserClient : public ShellContentBrowserClient {
|
|
@@ -210,10 +210,10 @@ index c576ace24e81cc877aa2595d40e0a13a7af9f6a2..210fb97d44c19c29af424cc7b9cb3169
|
|
|
|
|
|
} // 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 b5c8ad2661fc934eb334adc851d97d663054cdc0..d57e7e6203a36356ea6df0f97d81556d94844eba 100644
|
|
|
+index de0c2fab54859901352196a2e8de48d4b49e5056..ff6abde24c6bc863f721902bb90f47288ff4b543 100644
|
|
|
--- a/third_party/blink/renderer/core/frame/local_dom_window.cc
|
|
|
+++ b/third_party/blink/renderer/core/frame/local_dom_window.cc
|
|
|
-@@ -2246,6 +2246,8 @@ DOMWindow* LocalDOMWindow::open(v8::Isolate* isolate,
|
|
|
+@@ -2237,6 +2237,8 @@ DOMWindow* LocalDOMWindow::open(v8::Isolate* isolate,
|
|
|
WebWindowFeatures window_features =
|
|
|
GetWindowFeaturesFromString(features, entered_window);
|
|
|
|