@@ -9,10 +9,10 @@ potentially prevent a window from being created.
9
9
TODO(loc): this patch is currently broken.
10
10
11
11
diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
12
- index fdeb569224d06ce20f5cfd21cb0f40e3caaa2f6a..a248259b4cb999fb980df8589f41aa61e02b6131 100644
12
+ index 0536c904b8e4ad8bfa9f4ab27250f979dab91b06..5873720454adfb5c4ab92c7748f9a2658a24c33f 100644
13
13
--- a/content/browser/renderer_host/render_frame_host_impl.cc
14
14
+++ b/content/browser/renderer_host/render_frame_host_impl.cc
15
- @@ -8567 ,6 +8567 ,7 @@ void RenderFrameHostImpl::CreateNewWindow(
15
+ @@ -8581 ,6 +8581 ,7 @@ void RenderFrameHostImpl::CreateNewWindow(
16
16
last_committed_origin_, params->window_container_type,
17
17
params->target_url, params->referrer.To<Referrer>(),
18
18
params->frame_name, params->disposition, *params->features,
@@ -21,10 +21,10 @@ index fdeb569224d06ce20f5cfd21cb0f40e3caaa2f6a..a248259b4cb999fb980df8589f41aa61
21
21
&no_javascript_access);
22
22
23
23
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
24
- index 4609735590ae06cb6d105b3d5eeadb91ee3cc352..8f283acb574f02e37e7e8953e39b1095e0f92669 100644
24
+ index 1307fb18bb042f4aa2f099ab920aa0346d382a1b..bc5fc8b9e2660d1e6fa97598ff951040512c846c 100644
25
25
--- a/content/browser/web_contents/web_contents_impl.cc
26
26
+++ b/content/browser/web_contents/web_contents_impl.cc
27
- @@ -4762 ,6 +4762 ,12 @@ FrameTree* WebContentsImpl::CreateNewWindow(
27
+ @@ -4763 ,6 +4763 ,12 @@ FrameTree* WebContentsImpl::CreateNewWindow(
28
28
29
29
auto* new_contents_impl = new_contents.get();
30
30
@@ -37,7 +37,7 @@ index 4609735590ae06cb6d105b3d5eeadb91ee3cc352..8f283acb574f02e37e7e8953e39b1095
37
37
// If the new frame has a name, make sure any SiteInstances that can find
38
38
// this named frame have proxies for it. Must be called after
39
39
// SetSessionStorageNamespace, since this calls CreateRenderView, which uses
40
- @@ -4803 ,12 +4809 ,6 @@ FrameTree* WebContentsImpl::CreateNewWindow(
40
+ @@ -4804 ,12 +4810 ,6 @@ FrameTree* WebContentsImpl::CreateNewWindow(
41
41
AddWebContentsDestructionObserver(new_contents_impl);
42
42
}
43
43
@@ -66,10 +66,10 @@ index 6df9186bcee6a56da11da8e365c7cf5b4375e366..0fdda1a6e0ac98a8c8619b4d4fab5977
66
66
67
67
// Operation result when the renderer asks the browser to create a new window.
68
68
diff --git a/content/public/browser/content_browser_client.cc b/content/public/browser/content_browser_client.cc
69
- index 2668ab84237c37b7df1e2b19ceda0ed012c0c072..8a7bdd7ff737795411368ce41e94bba8eb53bd0a 100644
69
+ index c15c7f969951bab98be416b3a57e0f8ebd46c4bc..927d85c07c11b4b4e2fe56125d38ef3b5477f172 100644
70
70
--- a/content/public/browser/content_browser_client.cc
71
71
+++ b/content/public/browser/content_browser_client.cc
72
- @@ -741 ,6 +741 ,8 @@ bool ContentBrowserClient::CanCreateWindow(
72
+ @@ -742 ,6 +742 ,8 @@ bool ContentBrowserClient::CanCreateWindow(
73
73
const std::string& frame_name,
74
74
WindowOpenDisposition disposition,
75
75
const blink::mojom::WindowFeatures& features,
@@ -79,7 +79,7 @@ index 2668ab84237c37b7df1e2b19ceda0ed012c0c072..8a7bdd7ff737795411368ce41e94bba8
79
79
bool opener_suppressed,
80
80
bool* no_javascript_access) {
81
81
diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
82
- index e5c261c9d1eaa5550609ac28a6fcfebebf0ee091..223265d74f6c5056e5e6af6adcb115cf406f0c5f 100644
82
+ index bf8a6e4636065003dd33f0da71d006278ffa6b5f..e04ef368815fa5e5a281e0dc785f180bce77369d 100644
83
83
--- a/content/public/browser/content_browser_client.h
84
84
+++ b/content/public/browser/content_browser_client.h
85
85
@@ -188,6 +188,7 @@ class NetworkService;
@@ -90,7 +90,7 @@ index e5c261c9d1eaa5550609ac28a6fcfebebf0ee091..223265d74f6c5056e5e6af6adcb115cf
90
90
} // namespace network
91
91
92
92
namespace sandbox {
93
- @@ -1255 ,6 +1256 ,8 @@ class CONTENT_EXPORT ContentBrowserClient {
93
+ @@ -1273 ,6 +1274 ,8 @@ class CONTENT_EXPORT ContentBrowserClient {
94
94
const std::string& frame_name,
95
95
WindowOpenDisposition disposition,
96
96
const blink::mojom::WindowFeatures& features,
@@ -148,10 +148,10 @@ index fd851a9347dd6920e035bc9183991ea2a275aff4..579a796fcfdecf44ab415ceebc30b427
148
148
// typically happens when popups are created.
149
149
virtual void WebContentsCreated(WebContents* source_contents,
150
150
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
151
- index a734cc0568ba54c1c792c494a0e8fab7345bad84..5849f1cfd4fbeaefa6a63a4bbe55850d590fbc4b 100644
151
+ index a8dec1b3471abcda88cb03470906389bf29b3503..e5c8967a41c7cd645dfc5d6589a540e2027024df 100644
152
152
--- a/content/renderer/render_frame_impl.cc
153
153
+++ b/content/renderer/render_frame_impl.cc
154
- @@ -6664 ,6 +6664 ,10 @@ WebView* RenderFrameImpl::CreateNewWindow(
154
+ @@ -6667 ,6 +6667 ,10 @@ WebView* RenderFrameImpl::CreateNewWindow(
155
155
request.HasUserGesture(), GetWebFrame()->IsAdFrame(),
156
156
GetWebFrame()->IsAdScriptInStack());
157
157
@@ -189,7 +189,7 @@ index 53949c3510d0755e608847e174de63f46c8c2363..f6644476d8714fd02480830ebb0f0571
189
189
bool opener_suppressed,
190
190
bool* no_javascript_access) override;
191
191
diff --git a/third_party/blink/public/web/web_window_features.h b/third_party/blink/public/web/web_window_features.h
192
- index c79c07788b16c394ed413a6a739b7dcdd4697496..1b25625d84fe6b2c64de106b4e86e9acc09a0c36 100644
192
+ index 7c901dcc9f171a936ee6eb41dfd899a095a8a915..71748ad3a28946f816e2001ba78bbcb56cac7629 100644
193
193
--- a/third_party/blink/public/web/web_window_features.h
194
194
+++ b/third_party/blink/public/web/web_window_features.h
195
195
@@ -35,6 +35,7 @@
@@ -200,7 +200,7 @@ index c79c07788b16c394ed413a6a739b7dcdd4697496..1b25625d84fe6b2c64de106b4e86e9ac
200
200
201
201
namespace blink {
202
202
203
- @@ -69 ,6 +70 ,8 @@ struct WebWindowFeatures {
203
+ @@ -70 ,6 +71 ,8 @@ struct WebWindowFeatures {
204
204
// TODO(apaseltiner): Investigate moving this field to a non-public struct
205
205
// since it is only needed within //third_party/blink.
206
206
std::optional<WebVector<WebString>> attribution_srcs;
0 commit comments