| Index: content/renderer/render_frame_proxy.cc
|
| diff --git a/content/renderer/render_frame_proxy.cc b/content/renderer/render_frame_proxy.cc
|
| index 8f429c68c4b94f2e76c960d3842550098535b48f..4c9c919df14378016c8fd07d7a731434cb69bcc2 100644
|
| --- a/content/renderer/render_frame_proxy.cc
|
| +++ b/content/renderer/render_frame_proxy.cc
|
| @@ -82,7 +82,7 @@ RenderFrameProxy* RenderFrameProxy::CreateProxyToReplaceFrame(
|
| RenderFrameProxy* RenderFrameProxy::CreateFrameProxy(
|
| int routing_id,
|
| int render_view_routing_id,
|
| - int opener_routing_id,
|
| + blink::WebFrame* opener,
|
| int parent_routing_id,
|
| const FrameReplicationState& replicated_state) {
|
| RenderFrameProxy* parent = nullptr;
|
| @@ -95,9 +95,6 @@ RenderFrameProxy* RenderFrameProxy::CreateFrameProxy(
|
| return nullptr;
|
| }
|
|
|
| - blink::WebFrame* opener =
|
| - RenderFrameImpl::ResolveOpener(opener_routing_id, nullptr);
|
| -
|
| std::unique_ptr<RenderFrameProxy> proxy(
|
| new RenderFrameProxy(routing_id, MSG_ROUTING_NONE));
|
| RenderViewImpl* render_view = nullptr;
|
| @@ -327,8 +324,7 @@ void RenderFrameProxy::OnSetChildFrameSurface(
|
| }
|
|
|
| void RenderFrameProxy::OnUpdateOpener(int opener_routing_id) {
|
| - blink::WebFrame* opener =
|
| - RenderFrameImpl::ResolveOpener(opener_routing_id, nullptr);
|
| + blink::WebFrame* opener = RenderFrameImpl::ResolveOpener(opener_routing_id);
|
| web_frame_->setOpener(opener);
|
| }
|
|
|
|
|