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 56682d7b3352ade8c7f5195eecd0d986a7e07c71..bc52b2be881807e1c0e4b98d90a1f327323d3eaa 100644 |
--- a/third_party/WebKit/Source/web/WebLocalFrameImpl.cpp |
+++ b/third_party/WebKit/Source/web/WebLocalFrameImpl.cpp |
@@ -1999,9 +1999,12 @@ void WebLocalFrameImpl::initializeToReplaceRemoteFrame(WebRemoteFrame* oldWebFra |
OwnPtrWillBeRawPtr<FrameOwner> tempOwner = RemoteBridgeFrameOwner::create(nullptr, SandboxNone, WebFrameOwnerProperties()); |
RefPtrWillBeRawPtr<LocalFrame> frame = LocalFrame::create(m_frameLoaderClientImpl.get(), oldFrame->host(), tempOwner.get()); |
frame->setOwner(oldFrame->owner()); |
- frame->tree().setName(name); |
setParent(oldWebFrame->parent()); |
setOpener(oldWebFrame->opener()); |
+ |
+ // Set the name and unique name directly. |
+ // TODO(creis): Remove |name| parameter. |
Charlie Reis
2015/11/06 23:04:48
We would need to be able to call WebRemoteFrame::n
|
+ frame->tree().setNameForReplacementFrame(name, oldWebFrame->uniqueName()); |
setCoreFrame(frame); |
if (frame->owner() && !frame->owner()->isLocal()) { |