Index: third_party/WebKit/Source/web/WebLocalFrameImpl.cpp |
diff --git a/third_party/WebKit/Source/web/WebLocalFrameImpl.cpp b/third_party/WebKit/Source/web/WebLocalFrameImpl.cpp |
index 1fd3dd060f82da732c98439bfbdc752f3485df71..8a1bd2d3c132552d337ee22745bc56204812dbd2 100644 |
--- a/third_party/WebKit/Source/web/WebLocalFrameImpl.cpp |
+++ b/third_party/WebKit/Source/web/WebLocalFrameImpl.cpp |
@@ -680,16 +680,6 @@ WebView* WebLocalFrameImpl::view() const |
return viewImpl(); |
} |
-void WebLocalFrameImpl::setOpener(WebFrame* opener) |
-{ |
- WebFrame::setOpener(opener); |
- |
- // TODO(alexmos,dcheng): This should ASSERT(m_frame) once we no longer have |
- // provisional local frames. |
- if (m_frame && m_frame->document()) |
- m_frame->document()->initSecurityContext(); |
-} |
- |
WebDocument WebLocalFrameImpl::document() const |
{ |
if (!frame() || !frame()->document()) |
@@ -1440,9 +1430,9 @@ WebString WebLocalFrameImpl::layerTreeAsText(bool showDebugInfo) const |
// WebLocalFrameImpl public --------------------------------------------------------- |
-WebLocalFrame* WebLocalFrame::create(WebTreeScopeType scope, WebFrameClient* client) |
+WebLocalFrame* WebLocalFrame::create(WebTreeScopeType scope, WebFrameClient* client, WebFrame* opener) |
{ |
- return WebLocalFrameImpl::create(scope, client); |
+ return WebLocalFrameImpl::create(scope, client, opener); |
} |
WebLocalFrame* WebLocalFrame::createProvisional(WebFrameClient* client, WebRemoteFrame* oldWebFrame, WebSandboxFlags flags, const WebFrameOwnerProperties& frameOwnerProperties) |
@@ -1450,9 +1440,10 @@ WebLocalFrame* WebLocalFrame::createProvisional(WebFrameClient* client, WebRemot |
return WebLocalFrameImpl::createProvisional(client, oldWebFrame, flags, frameOwnerProperties); |
} |
-WebLocalFrameImpl* WebLocalFrameImpl::create(WebTreeScopeType scope, WebFrameClient* client) |
+WebLocalFrameImpl* WebLocalFrameImpl::create(WebTreeScopeType scope, WebFrameClient* client, WebFrame* opener) |
{ |
WebLocalFrameImpl* frame = new WebLocalFrameImpl(scope, client); |
+ frame->setOpener(opener); |
#if ENABLE(OILPAN) |
return frame; |
#else |