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

Unified Diff: content/renderer/render_view_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_view_impl.cc
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index eb0b33d88a2dafdfb928b85ee6d138af449e2ee6..9ef9b03601346ec597a8faeb0f9617ae2e0500ff 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -686,7 +686,7 @@ void RenderViewImpl::Initialize(const ViewMsg_New_Params& params,
if (params.main_frame_routing_id != MSG_ROUTING_NONE) {
main_render_frame_ = RenderFrameImpl::CreateMainFrame(
this, params.main_frame_routing_id, params.main_frame_widget_routing_id,
- params.hidden, screen_info(), compositor_deps_);
+ params.hidden, screen_info(), compositor_deps_, opener_frame);
}
if (params.proxy_routing_id != MSG_ROUTING_NONE) {
@@ -699,11 +699,9 @@ void RenderViewImpl::Initialize(const ViewMsg_New_Params& params,
main_render_frame_->set_render_frame_proxy(proxy);
} else {
CHECK(SiteIsolationPolicy::IsSwappedOutStateForbidden());
- // Pass MSG_ROUTING_NONE for opener, since actual opener (if any) will be
- // set separately below.
- RenderFrameProxy::CreateFrameProxy(params.proxy_routing_id, routing_id(),
- MSG_ROUTING_NONE, MSG_ROUTING_NONE,
- params.replicated_frame_state);
+ RenderFrameProxy::CreateFrameProxy(
+ params.proxy_routing_id, routing_id(), params.opener_frame_route_id,
+ MSG_ROUTING_NONE, params.replicated_frame_state);
}
}
@@ -808,8 +806,6 @@ void RenderViewImpl::Initialize(const ViewMsg_New_Params& params,
// If we have an opener_frame but we weren't created by a renderer, then it's
// the browser asking us to set our opener to another frame.
if (opener_frame && !was_created_by_renderer) {
- webview()->mainFrame()->setOpener(opener_frame);
-
// Ensure that sandbox flags are inherited from an opener in a different
// process. In that case, the browser process will set any inherited
// sandbox flags in |replicated_frame_state|, so apply them here.

Powered by Google App Engine
This is Rietveld 408576698