|
@@ -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 f46871f9237917f17295e134bce1082ce2084e27..ecdc9ce92365c49c94267cfb85b4b56868b70376 100644
|
|
|
+index 26d5f062cdc434139f6b136f12315e18f5db749e..c89d95fdfe292d87949e2ad6ef0ab499092c7148 100644
|
|
|
--- a/content/browser/renderer_host/render_frame_host_impl.cc
|
|
|
+++ b/content/browser/renderer_host/render_frame_host_impl.cc
|
|
|
-@@ -7628,6 +7628,7 @@ void RenderFrameHostImpl::CreateNewWindow(
|
|
|
+@@ -7634,6 +7634,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,
|
|
@@ -51,10 +51,10 @@ index 8cd33cbc8b38368fbf64c3ed74d7b37d88c44abf..e410f83816f6579dd07062b5037bf044
|
|
|
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 4fbba74078390c0c530294d65fd0ce74c3eec65a..6f9a676c10ff009fa3d27f2ab33c4c12562037a1 100644
|
|
|
+index c7cc09531bd7b2c67085a7a3d9f98ab060a62ccb..faa0a7cd254b84af686f0c321f4d718f85636770 100644
|
|
|
--- a/content/common/frame.mojom
|
|
|
+++ b/content/common/frame.mojom
|
|
|
-@@ -592,6 +592,10 @@ struct CreateNewWindowParams {
|
|
|
+@@ -599,6 +599,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 4fbba74078390c0c530294d65fd0ce74c3eec65a..6f9a676c10ff009fa3d27f2ab33c4c12
|
|
|
|
|
|
// 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 e996294b57d6441d95ca290675265a4d155a4c78..3e7e5219da2e428b60642417235eb53d2209d4c2 100644
|
|
|
+index 5339daee92f0d840fa40999efcfa9c3e7a0be769..96f6ae76972060d409146b01e782d0e5ca19c032 100644
|
|
|
--- a/content/public/browser/content_browser_client.cc
|
|
|
+++ b/content/public/browser/content_browser_client.cc
|
|
|
-@@ -634,6 +634,8 @@ bool ContentBrowserClient::CanCreateWindow(
|
|
|
+@@ -630,6 +630,8 @@ bool ContentBrowserClient::CanCreateWindow(
|
|
|
const std::string& frame_name,
|
|
|
WindowOpenDisposition disposition,
|
|
|
const blink::mojom::WindowFeatures& features,
|
|
@@ -79,7 +79,7 @@ index e996294b57d6441d95ca290675265a4d155a4c78..3e7e5219da2e428b60642417235eb53d
|
|
|
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 1acdf47d744a512b0452c91aa7cf4a1e4af949f6..dd52f45aa0d2931b67e707082f6afd493c1201bb 100644
|
|
|
+index 24e6a9599f178858cb39d3bb2a78764d97c538bd..04259a39040c47912da72cccf2a223555590d173 100644
|
|
|
--- a/content/public/browser/content_browser_client.h
|
|
|
+++ b/content/public/browser/content_browser_client.h
|
|
|
@@ -164,6 +164,7 @@ class NetworkService;
|
|
@@ -90,7 +90,7 @@ index 1acdf47d744a512b0452c91aa7cf4a1e4af949f6..dd52f45aa0d2931b67e707082f6afd49
|
|
|
} // namespace network
|
|
|
|
|
|
namespace sandbox {
|
|
|
-@@ -1027,6 +1028,8 @@ class CONTENT_EXPORT ContentBrowserClient {
|
|
|
+@@ -1023,6 +1024,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 0492b7641facac05b9fc37a5f5a766ab7b658498..266b52ee18cf3f9cf25cb394780f098c292b9449 100644
|
|
|
+index 77a944d5f347f595ec525d4c43b25bc1eaf2d75d..ec5f9cd23baefd6a1fd6d0185566ebbad908c3aa 100644
|
|
|
--- a/content/renderer/render_frame_impl.cc
|
|
|
+++ b/content/renderer/render_frame_impl.cc
|
|
|
-@@ -6268,6 +6268,10 @@ WebView* RenderFrameImpl::CreateNewWindow(
|
|
|
+@@ -6265,6 +6265,10 @@ WebView* RenderFrameImpl::CreateNewWindow(
|
|
|
blink::GetNavigationInitiatorActivationAndAdStatus(
|
|
|
request.HasUserGesture(), GetWebFrame()->IsAdScriptInStack());
|
|
|
|