Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2073)

Unified Diff: content/renderer/render_frame_impl.cc

Issue 1685003002: Plumb the correct owner document through DocumentInit::m_owner. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Trim thingie Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/renderer/render_frame_impl.cc
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index b82f08ebe2ed9010c7831b48c75777a6856d92bf..f3bc35b4a4b58f7046091ca7c95eb47ae794660d 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -809,14 +809,15 @@ RenderFrameImpl* RenderFrameImpl::CreateMainFrame(
int32_t widget_routing_id,
bool hidden,
const blink::WebScreenInfo& screen_info,
- CompositorDependencies* compositor_deps) {
+ CompositorDependencies* compositor_deps,
+ blink::WebFrame* opener) {
// A main frame RenderFrame must have a RenderWidget.
DCHECK_NE(MSG_ROUTING_NONE, widget_routing_id);
RenderFrameImpl* render_frame =
RenderFrameImpl::Create(render_view, routing_id);
- WebLocalFrame* web_frame =
- WebLocalFrame::create(blink::WebTreeScopeType::Document, render_frame);
+ WebLocalFrame* web_frame = WebLocalFrame::create(
+ blink::WebTreeScopeType::Document, render_frame, opener);
render_frame->BindToWebFrame(web_frame);
render_view->webview()->setMainFrame(web_frame);
render_frame->render_widget_ = RenderWidget::CreateForFrame(
@@ -865,7 +866,8 @@ void RenderFrameImpl::CreateFrame(
replicated_state.scope, WebString::fromUTF8(replicated_state.name),
WebString::fromUTF8(replicated_state.unique_name),
replicated_state.sandbox_flags, render_frame,
- previous_sibling_web_frame, frame_owner_properties);
+ previous_sibling_web_frame, frame_owner_properties,
+ ResolveOpener(opener_routing_id, nullptr));
// The RenderFrame is created and inserted into the frame tree in the above
// call to createLocalChild.
@@ -889,9 +891,6 @@ void RenderFrameImpl::CreateFrame(
render_frame->BindToWebFrame(web_frame);
CHECK(parent_routing_id != MSG_ROUTING_NONE || !web_frame->parent());
- WebFrame* opener = ResolveOpener(opener_routing_id, nullptr);
- web_frame->setOpener(opener);
-
if (widget_params.routing_id != MSG_ROUTING_NONE) {
CHECK(!web_frame->parent() ||
SiteIsolationPolicy::AreCrossProcessFramesPossible());

Powered by Google App Engine
This is Rietveld 408576698