|
@@ -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 0e13e4cddce57b7d004241d2619ee83358d87a39..df28eb7e3b2f4c7030ef5363dd68c1c2c7db2cac 100644
|
|
|
+index 8accd729b4f39c738b722d36bc0bbe769e598cba..2937f35372bafd9158be712f04d2731bb4100f9a 100644
|
|
|
--- a/content/browser/renderer_host/render_frame_host_impl.cc
|
|
|
+++ b/content/browser/renderer_host/render_frame_host_impl.cc
|
|
|
-@@ -7710,6 +7710,7 @@ void RenderFrameHostImpl::CreateNewWindow(
|
|
|
+@@ -7711,6 +7711,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 12f4a2066a2a31e9852216c0cb3344095c7b0e39..588ca46227c58f9596317d6d4d05d0b3
|
|
|
|
|
|
// 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 8182fa1e9ec189fb181e3c32b6a96c10011a49e1..764287eeb851136bd5ea5143fc5b4f9e675fce49 100644
|
|
|
+index abc759cc548276accc0869b67c55d1078cf4c097..36e70e69615a4463afdb7b069b60f20d010dfb27 100644
|
|
|
--- a/content/public/browser/content_browser_client.cc
|
|
|
+++ b/content/public/browser/content_browser_client.cc
|
|
|
@@ -631,6 +631,8 @@ bool ContentBrowserClient::CanCreateWindow(
|
|
@@ -79,7 +79,7 @@ index 8182fa1e9ec189fb181e3c32b6a96c10011a49e1..764287eeb851136bd5ea5143fc5b4f9e
|
|
|
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 3a843b83b86f868998ea9c2289874eb89fdec41a..b0534cbc6754f313b798436b39146da59d3fb32c 100644
|
|
|
+index 6fc121fb5f3a418763df5042619f89cae0551a00..d89b97d141c66696caa5535b03f4da994fd28210 100644
|
|
|
--- a/content/public/browser/content_browser_client.h
|
|
|
+++ b/content/public/browser/content_browser_client.h
|
|
|
@@ -165,6 +165,7 @@ class NetworkService;
|
|
@@ -90,7 +90,7 @@ index 3a843b83b86f868998ea9c2289874eb89fdec41a..b0534cbc6754f313b798436b39146da5
|
|
|
} // namespace network
|
|
|
|
|
|
namespace sandbox {
|
|
|
-@@ -1031,6 +1032,8 @@ class CONTENT_EXPORT ContentBrowserClient {
|
|
|
+@@ -1032,6 +1033,8 @@ class CONTENT_EXPORT ContentBrowserClient {
|
|
|
const std::string& frame_name,
|
|
|
WindowOpenDisposition disposition,
|
|
|
const blink::mojom::WindowFeatures& features,
|
|
@@ -148,10 +148,10 @@ index 5da6f93293bc5ddae88c17ac2dd8d7037ba8e8f3..76d699790fb7d92587293b14332f696d
|
|
|
// 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 0a0aa8f85c5c818fffc310f4d05a6886f7d6272b..f45f542fa3131036624686cd33a90097e6400ff5 100644
|
|
|
+index 3257ffeafbc86eb728e58498a2c2283eabf305f3..456304cef9e3a8063b112b3f4cfabc25d9d479d4 100644
|
|
|
--- a/content/renderer/render_frame_impl.cc
|
|
|
+++ b/content/renderer/render_frame_impl.cc
|
|
|
-@@ -6318,6 +6318,10 @@ WebView* RenderFrameImpl::CreateNewWindow(
|
|
|
+@@ -6317,6 +6317,10 @@ WebView* RenderFrameImpl::CreateNewWindow(
|
|
|
blink::GetNavigationInitiatorActivationAndAdStatus(
|
|
|
request.HasUserGesture(), GetWebFrame()->IsAdScriptInStack());
|
|
|
|