|
@@ -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 671c080fda95fca7f4bb3f062f45af38332009d2..b6ce43f6572dafce380c1f32cc4dffab87951128 100644
|
|
|
+index edad6340adbb1ac8a0b1400334e5f1c1fd7f7d60..15c5a71ea628d1671575764649a598511568ce50 100644
|
|
|
--- a/content/browser/renderer_host/render_frame_host_impl.cc
|
|
|
+++ b/content/browser/renderer_host/render_frame_host_impl.cc
|
|
|
-@@ -8846,6 +8846,7 @@ void RenderFrameHostImpl::CreateNewWindow(
|
|
|
+@@ -8839,6 +8839,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,
|
|
@@ -21,10 +21,10 @@ index 671c080fda95fca7f4bb3f062f45af38332009d2..b6ce43f6572dafce380c1f32cc4dffab
|
|
|
&no_javascript_access);
|
|
|
|
|
|
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
|
|
|
-index bb302e14dfe5f2b35969e0fd8faabd12d08f8a35..9e4d5d29205822b83926bae99020dc0ffe031b50 100644
|
|
|
+index 7df7f6c24ff8f6cc197118d872ea1e6f4111e94d..00b580e280d83c87c9ef57a5813167c95dc36dc4 100644
|
|
|
--- a/content/browser/web_contents/web_contents_impl.cc
|
|
|
+++ b/content/browser/web_contents/web_contents_impl.cc
|
|
|
-@@ -4738,6 +4738,12 @@ FrameTree* WebContentsImpl::CreateNewWindow(
|
|
|
+@@ -4728,6 +4728,12 @@ FrameTree* WebContentsImpl::CreateNewWindow(
|
|
|
new_contents_impl->is_popup_ =
|
|
|
params.disposition == WindowOpenDisposition::NEW_POPUP;
|
|
|
|
|
@@ -37,7 +37,7 @@ index bb302e14dfe5f2b35969e0fd8faabd12d08f8a35..9e4d5d29205822b83926bae99020dc0f
|
|
|
// If the new frame has a name, make sure any SiteInstances that can find
|
|
|
// this named frame have proxies for it. Must be called after
|
|
|
// SetSessionStorageNamespace, since this calls CreateRenderView, which uses
|
|
|
-@@ -4779,12 +4785,6 @@ FrameTree* WebContentsImpl::CreateNewWindow(
|
|
|
+@@ -4769,12 +4775,6 @@ FrameTree* WebContentsImpl::CreateNewWindow(
|
|
|
AddWebContentsDestructionObserver(new_contents_impl);
|
|
|
}
|
|
|
|
|
@@ -66,7 +66,7 @@ index 37a00f8d520e6043faa9b202e2f7a3d7a0794664..08b56afaa591137aafc4aad38da84361
|
|
|
|
|
|
// 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 c57bd64770957439b4615f7226d51295c44853a2..aec697a48f3caabd319e0c79de0594d75dba800e 100644
|
|
|
+index 55f9b8c0f172b65565a2fd2755afff13a961f742..9bb7da6569f95a37451de377b898f1e4ac4bab6c 100644
|
|
|
--- a/content/public/browser/content_browser_client.cc
|
|
|
+++ b/content/public/browser/content_browser_client.cc
|
|
|
@@ -750,6 +750,8 @@ bool ContentBrowserClient::CanCreateWindow(
|
|
@@ -79,7 +79,7 @@ index c57bd64770957439b4615f7226d51295c44853a2..aec697a48f3caabd319e0c79de0594d7
|
|
|
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 947575f644bab1cfc416683ee6b6de2f784603e1..811ec61bcb9b962bc71f8959e6b9cb0757bf7143 100644
|
|
|
+index 50284d81904d85ca3f9fe42d1a698bbd88ca2ca2..712e7824d63538fbef1c5b552d0c1c245596e4bc 100644
|
|
|
--- a/content/public/browser/content_browser_client.h
|
|
|
+++ b/content/public/browser/content_browser_client.h
|
|
|
@@ -189,6 +189,7 @@ class NetworkService;
|