Index: content/renderer/render_frame_impl.cc |
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc |
index 900c92c15303f1b8ba37135b671c31bb83d23ea2..c5068b6357f5246f96249fb4650a14f2f0f69a72 100644 |
--- a/content/renderer/render_frame_impl.cc |
+++ b/content/renderer/render_frame_impl.cc |
@@ -902,10 +902,10 @@ RenderFrameImpl* RenderFrameImpl::CreateMainFrame( |
RenderFrameImpl* render_frame = |
RenderFrameImpl::Create(render_view, routing_id); |
- render_frame->InitializeBlameContext(nullptr); |
WebLocalFrame* web_frame = WebLocalFrame::create( |
blink::WebTreeScopeType::Document, render_frame, opener); |
render_frame->BindToWebFrame(web_frame); |
+ render_frame->InitializeBlameContext(nullptr); |
render_view->webview()->setMainFrame(web_frame); |
render_frame->render_widget_ = RenderWidget::CreateForFrame( |
widget_routing_id, hidden, screen_info, compositor_deps, web_frame); |
@@ -932,6 +932,7 @@ void RenderFrameImpl::CreateFrame( |
const blink::WebFrameOwnerProperties& frame_owner_properties) { |
blink::WebLocalFrame* web_frame; |
RenderFrameImpl* render_frame; |
+ RenderFrameImpl* parent_frame = nullptr; |
if (proxy_routing_id == MSG_ROUTING_NONE) { |
RenderFrameProxy* parent_proxy = |
RenderFrameProxy::FromRoutingID(parent_routing_id); |
@@ -949,7 +950,7 @@ void RenderFrameImpl::CreateFrame( |
// Create the RenderFrame and WebLocalFrame, linking the two. |
render_frame = |
RenderFrameImpl::Create(parent_proxy->render_view(), routing_id); |
- render_frame->InitializeBlameContext(FromRoutingID(parent_routing_id)); |
+ parent_frame = FromRoutingID(parent_routing_id); |
web_frame = parent_web_frame->createLocalChild( |
replicated_state.scope, WebString::fromUTF8(replicated_state.name), |
WebString::fromUTF8(replicated_state.unique_name), |
@@ -971,13 +972,13 @@ void RenderFrameImpl::CreateFrame( |
return; |
render_frame = RenderFrameImpl::Create(proxy->render_view(), routing_id); |
- render_frame->InitializeBlameContext(nullptr); |
render_frame->proxy_routing_id_ = proxy_routing_id; |
web_frame = blink::WebLocalFrame::createProvisional( |
render_frame, proxy->web_frame(), replicated_state.sandbox_flags, |
frame_owner_properties); |
} |
render_frame->BindToWebFrame(web_frame); |
+ render_frame->InitializeBlameContext(parent_frame); |
CHECK(parent_routing_id != MSG_ROUTING_NONE || !web_frame->parent()); |
if (widget_params.routing_id != MSG_ROUTING_NONE) { |
@@ -2731,10 +2732,10 @@ blink::WebFrame* RenderFrameImpl::createChildFrame( |
// Create the RenderFrame and WebLocalFrame, linking the two. |
RenderFrameImpl* child_render_frame = RenderFrameImpl::Create( |
render_view_.get(), child_routing_id); |
- child_render_frame->InitializeBlameContext(this); |
blink::WebLocalFrame* web_frame = |
WebLocalFrame::create(scope, child_render_frame); |
child_render_frame->BindToWebFrame(web_frame); |
+ child_render_frame->InitializeBlameContext(this); |
// Add the frame to the frame tree and initialize it. |
parent->appendChild(web_frame); |