Prepare for remote->local frame swap

Source/web/WebFrame.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 "public/web/WebFrame.h"
 
 #include "core/frame/FrameHost.h"
 #include "core/frame/RemoteFrame.h"
 #include "core/html/HTMLFrameOwnerElement.h"
@@ skipping 24 matching lines @@
     // All child frames must be detached first.
     oldFrame->detachChildren();
 
     // If the frame has been detached during detaching its children, return
     // immediately.
     // FIXME: There is no unit test for this condition, so one needs to be
     // written.
     if (!oldFrame->host())
         return false;
 
-    // The frame being swapped in should not have a Frame associated
-    // with it yet.
-    ASSERT(!toCoreFrame(frame));
-
     if (m_parent) {
         if (m_parent->m_firstChild == this)
             m_parent->m_firstChild = frame;
         if (m_parent->m_lastChild == this)
             m_parent->m_lastChild = frame;
         swap(m_parent, frame->m_parent);
     }
 
     if (m_previousSibling) {
         m_previousSibling->m_nextSibling = frame;
@@ skipping 13 matching lines @@
         m_openedFrameTracker->updateOpener(frame);
         frame->m_openedFrameTracker.reset(m_openedFrameTracker.release());
     }
 
     // Finally, clone the state of the current Frame into one matching
     // the type of the passed in WebFrame.
     // FIXME: This is a bit clunky; this results in pointless decrements and
     // increments of connected subframes.
     FrameOwner* owner = oldFrame->owner();
     oldFrame->disconnectOwnerElement();
-    if (frame->isWebLocalFrame()) {
+    if (toCoreFrame(frame)) {
+        ASSERT(owner == toCoreFrame(frame)->owner());
+        if (owner->isLocal())
+            toHTMLFrameOwnerElement(owner)->setContentFrame(*toCoreFrame(frame));
+    } else if (frame->isWebLocalFrame()) {
         toWebLocalFrameImpl(frame)->initializeCoreFrame(oldFrame->host(), owner, oldFrame->tree().name(), nullAtom);
     } else {
         toWebRemoteFrameImpl(frame)->initializeCoreFrame(oldFrame->host(), owner, oldFrame->tree().name());
     }
 
     return true;
 }
 
 void WebFrame::detach()
 {
@@ skipping 46 matching lines @@
         m_lastChild = child->m_previousSibling;
     else
         child->m_nextSibling->m_previousSibling = child->m_previousSibling;
 
     child->m_previousSibling = child->m_nextSibling = 0;
 
     toCoreFrame(this)->tree().invalidateScopedChildCount();
     toCoreFrame(this)->host()->decrementSubframeCount();
 }
 
+void WebFrame::setParent(WebFrame* parent)
+{
+    m_parent = parent;
+}
+
 WebFrame* WebFrame::parent() const
 {
     return m_parent;
 }
 
 WebFrame* WebFrame::top() const
 {
     WebFrame* frame = const_cast<WebFrame*>(this);
     for (WebFrame* parent = frame; parent; parent = parent->m_parent)
         frame = parent;
@@ skipping 104 matching lines @@
 }
 
 void WebFrame::clearWeakFrames(Visitor* visitor)
 {
     if (!isFrameAlive(visitor, m_opener))
         m_opener = nullptr;
 }
 #endif
 
 } // namespace blink