|
@@ -9,7 +9,7 @@ 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 85817a5ba280c7475e50f42acb91d2e76bdccc2e..876c3a5c51b5e7e875e8885ea06fa171ecd4ab57 100644
|
|
|
+index bae7704ee1aaeeaafc7a3f2e0006f33ece8a4fa7..ec3fc7ab9e3ea915bcfe672f19a31ebf72b7e0cc 100644
|
|
|
--- a/content/browser/renderer_host/render_frame_host_impl.cc
|
|
|
+++ b/content/browser/renderer_host/render_frame_host_impl.cc
|
|
|
@@ -9115,6 +9115,7 @@ void RenderFrameHostImpl::CreateNewWindow(
|
|
@@ -51,10 +51,10 @@ index f25b2cc6c138a4e201b6ec9f74f9cb5734195f24..c67be0c23f8b8d6f49ee82e1617c0f3c
|
|
|
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 61ee456a1bfb842aefd8b644ff0ae630a698ef7c..cbf4276337139a81d46fb263bce8f5ee98da39a6 100644
|
|
|
+index 8e571dc1371cf2aa7c8354f0b4e492e0d030b485..c878169e7838849cbc23df2ed94ca65da4518f7f 100644
|
|
|
--- a/content/common/frame.mojom
|
|
|
+++ b/content/common/frame.mojom
|
|
|
-@@ -610,6 +610,10 @@ struct CreateNewWindowParams {
|
|
|
+@@ -617,6 +617,10 @@ struct CreateNewWindowParams {
|
|
|
// The navigation initiator's user activation and ad status.
|
|
|
blink.mojom.NavigationInitiatorActivationAndAdStatus
|
|
|
initiator_activation_and_ad_status;
|
|
@@ -66,10 +66,10 @@ 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 21967547790cacc162d9b125e60ca24919b6b485..af7126cec088e5ece113dfbea19674421182abaa 100644
|
|
|
+index 122e289519e1ddd2d20cbe0a0e9dbdf5c18f22fd..c5f3e3b56fc6c4407a4205894a7ab2a8d7cfa5c4 100644
|
|
|
--- a/content/public/browser/content_browser_client.cc
|
|
|
+++ b/content/public/browser/content_browser_client.cc
|
|
|
-@@ -765,6 +765,8 @@ bool ContentBrowserClient::CanCreateWindow(
|
|
|
+@@ -766,6 +766,8 @@ bool ContentBrowserClient::CanCreateWindow(
|
|
|
const std::string& frame_name,
|
|
|
WindowOpenDisposition disposition,
|
|
|
const blink::mojom::WindowFeatures& features,
|
|
@@ -79,7 +79,7 @@ index 21967547790cacc162d9b125e60ca24919b6b485..af7126cec088e5ece113dfbea1967442
|
|
|
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 0f6781dc459e1072e1f538b2c60c21699b175852..ad94803577af27c84e247ace2137995a9ca886e0 100644
|
|
|
+index 9bcf9d3a329a13a870bf3770def8c509fd105a76..c79526fab82974825c7500d927a02db8700aac6e 100644
|
|
|
--- a/content/public/browser/content_browser_client.h
|
|
|
+++ b/content/public/browser/content_browser_client.h
|
|
|
@@ -196,6 +196,7 @@ class NetworkService;
|
|
@@ -90,7 +90,7 @@ index 0f6781dc459e1072e1f538b2c60c21699b175852..ad94803577af27c84e247ace2137995a
|
|
|
} // namespace network
|
|
|
|
|
|
namespace sandbox {
|
|
|
-@@ -1325,6 +1326,8 @@ class CONTENT_EXPORT ContentBrowserClient {
|
|
|
+@@ -1331,6 +1332,8 @@ class CONTENT_EXPORT ContentBrowserClient {
|
|
|
const std::string& frame_name,
|
|
|
WindowOpenDisposition disposition,
|
|
|
const blink::mojom::WindowFeatures& features,
|
|
@@ -148,10 +148,10 @@ index 19dff7ea3f62e5095ee03335978dac5d58cc1465..cbec82fe1fbc43c188ac9c0cf318ee49
|
|
|
// 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 731064ab6b1b3856e05dec2800c0ce5768100bdb..612c7ba6cf8637e81631d63c36a618c812532879 100644
|
|
|
+index a3dbef2ff75b44e0b0b431d3a9e32ea6eb1d0208..f83572bbe5811a1cb537ec70bf12695ad8cb9cad 100644
|
|
|
--- a/content/renderer/render_frame_impl.cc
|
|
|
+++ b/content/renderer/render_frame_impl.cc
|
|
|
-@@ -6859,6 +6859,10 @@ WebView* RenderFrameImpl::CreateNewWindow(
|
|
|
+@@ -6855,6 +6855,10 @@ WebView* RenderFrameImpl::CreateNewWindow(
|
|
|
request.HasUserGesture(), GetWebFrame()->IsAdFrame(),
|
|
|
GetWebFrame()->IsAdScriptInStack());
|
|
|
|
|
@@ -163,7 +163,7 @@ index 731064ab6b1b3856e05dec2800c0ce5768100bdb..612c7ba6cf8637e81631d63c36a618c8
|
|
|
// 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 b181f3d7429cdccfede3803b0659fc877d68e884..874753add7c176871fee299d32199ebfd9526c68 100644
|
|
|
+index 3991d60e9e40c7b01637c1a2a2817e61157bfb3f..1ed70a0d597cc49edb96dbe95ea9f43b60a73aa2 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 b181f3d7429cdccfede3803b0659fc877d68e884..874753add7c176871fee299d32199ebf
|
|
|
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 126fe65469971b91e763a5e7640649dff1a096c4..398feea2aec7ece17d62259320db9035edabeccd 100644
|
|
|
+index 3c8c4a24af84a6c037ce93b10c8f77827cc64440..9389650aac41a76c77cb4924a6a53f0920a4dc65 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 {
|