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

Unified Diff: content/renderer/render_frame_proxy.cc

Issue 1312643002: Plumb opener information when creating RenderFrames and RenderFrameProxies for subframes. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@opener-CreateOpenerProxiesIfNeeded
Patch Set: Fix param ordering in RenderThreadImpl::OnCreateNewFrameProxy Created 5 years, 3 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
« no previous file with comments | « content/renderer/render_frame_proxy.h ('k') | content/renderer/render_thread_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_frame_proxy.cc
diff --git a/content/renderer/render_frame_proxy.cc b/content/renderer/render_frame_proxy.cc
index 9f03df23ebc52d5630e615c4473ccc51f15c7899..fc6091cd5ccc6474ba97c7eabe5684fa03aadee1 100644
--- a/content/renderer/render_frame_proxy.cc
+++ b/content/renderer/render_frame_proxy.cc
@@ -59,8 +59,9 @@ RenderFrameProxy* RenderFrameProxy::CreateProxyToReplaceFrame(
RenderFrameProxy* RenderFrameProxy::CreateFrameProxy(
int routing_id,
- int parent_routing_id,
int render_view_routing_id,
+ int opener_routing_id,
+ int parent_routing_id,
const FrameReplicationState& replicated_state) {
scoped_ptr<RenderFrameProxy> proxy(
new RenderFrameProxy(routing_id, MSG_ROUTING_NONE));
@@ -85,6 +86,10 @@ RenderFrameProxy* RenderFrameProxy::CreateFrameProxy(
render_view = parent->render_view();
}
+ blink::WebFrame* opener =
+ RenderFrameImpl::ResolveOpener(opener_routing_id, nullptr);
+ web_frame->setOpener(opener);
+
proxy->Init(web_frame, render_view);
// Initialize proxy's WebRemoteFrame with the security origin and other
« no previous file with comments | « content/renderer/render_frame_proxy.h ('k') | content/renderer/render_thread_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698