Initialize WebCore::Frame when swapping frames.

Source/web/WebRemoteFrameImpl.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 #include "web/WebRemoteFrameImpl.h"
 
 #include "core/frame/FrameOwner.h"
 #include "core/frame/RemoteFrame.h"
 #include "core/page/Page.h"
@@ skipping 112 matching lines @@
     return true;
 }
 
 WebRemoteFrame* WebRemoteFrameImpl::toWebRemoteFrame()
 {
     return this;
 }
 
 void WebRemoteFrameImpl::close()
 {
-    ASSERT_NOT_REACHED();
+    deref();
 }
 
 WebString WebRemoteFrameImpl::uniqueName() const
 {
     ASSERT_NOT_REACHED();
     return WebString();
 }
 
 WebString WebRemoteFrameImpl::assignedName() const
 {
@@ skipping 642 matching lines @@
 WebLocalFrame* WebRemoteFrameImpl::createLocalChild(const WebString& name, WebFrameClient* client)
 {
     WebLocalFrameImpl* child = toWebLocalFrameImpl(WebLocalFrame::create(client));
     HashMap<WebFrame*, OwnPtr<FrameOwner> >::AddResult result =
         m_ownersForChildren.add(child, adoptPtr(new RemoteBridgeFrameOwner(child)));
     appendChild(child);
     // FIXME: currently this calls LocalFrame::init() on the created LocalFrame, which may
     // result in the browser observing two navigations to about:blank (one from the initial
     // frame creation, and one from swapping it into the remote process). FrameLoader might
     // need a special initialization function for this case to avoid that duplicate navigation.
-    child->initializeAsChildFrame(frame()->host(), result.storedValue->value.get(), name, AtomicString());
+    child->initializeWebCoreFrame(frame()->host(), result.storedValue->value.get(), name, nullAtom);
     // Partially related with the above FIXME--the init() call may trigger JS dispatch. However,
     // if the parent is remote, it should never be detached synchronously...
     ASSERT(child->frame());
     return child;
 }
 
-void WebRemoteFrameImpl::initializeAsMainFrame(Page* page)
+void WebRemoteFrameImpl::initializeWebCoreFrame(FrameHost* host, FrameOwner* owner, const AtomicString& name)
 {
-    setWebCoreFrame(RemoteFrame::create(&m_frameClient, &page->frameHost(), 0));
+    setWebCoreFrame(RemoteFrame::create(&m_frameClient, host, owner));
+    m_frame->tree().setName(name, nullAtom);
 }
 
 WebRemoteFrame* WebRemoteFrameImpl::createRemoteChild(const WebString& name, WebFrameClient* client)
 {
     WebRemoteFrameImpl* child = toWebRemoteFrameImpl(WebRemoteFrame::create(client));
     HashMap<WebFrame*, OwnPtr<FrameOwner> >::AddResult result =
         m_ownersForChildren.add(child, adoptPtr(new PlaceholderFrameOwner));
     appendChild(child);
-    RefPtr<RemoteFrame> childFrame = RemoteFrame::create(&child->m_frameClient, frame()->host(), result.storedValue->value.get());
-    child->setWebCoreFrame(childFrame);
-    childFrame->tree().setName(name, AtomicString());
+    child->initializeWebCoreFrame(frame()->host(), result.storedValue->value.get(), name);
     return child;
 }
 
 void WebRemoteFrameImpl::setWebCoreFrame(PassRefPtr<RemoteFrame> frame)
 {
     m_frame = frame;
 }
 
 WebRemoteFrameImpl* WebRemoteFrameImpl::fromFrame(RemoteFrame& frame)
 {
     if (!frame.client())
         return 0;
     return static_cast<RemoteFrameClient*>(frame.client())->webFrame();
 }
 
 } // namespace blink