RemoteBridgeFrameOwner: keep better track of the attached frame

third_party/WebKit/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 "public/web/WebFrame.h"
 
 #include "bindings/core/v8/WindowProxyManager.h"
 #include "core/frame/FrameHost.h"
 #include "core/frame/FrameView.h"
 #include "core/frame/LocalFrame.h"
@@ skipping 54 matching lines @@
     if (m_opener) {
         frame->setOpener(m_opener);
         setOpener(nullptr);
     }
     m_openedFrameTracker->transferTo(frame);
 
     FrameHost* host = oldFrame->host();
     AtomicString name = oldFrame->tree().name();
     AtomicString uniqueName = oldFrame->tree().uniqueName();
     FrameOwner* owner = oldFrame->owner();
-    oldFrame->disconnectOwnerElement();
 
     v8::HandleScope handleScope(v8::Isolate::GetCurrent());
     HashMap<DOMWrapperWorld*, v8::Local<v8::Object>> globals;
     oldFrame->getWindowProxyManager()->clearForNavigation();
     oldFrame->getWindowProxyManager()->releaseGlobals(globals);
 
     // Although the Document in this frame is now unloaded, many resources
     // associated with the frame itself have not yet been freed yet.
     oldFrame->detach(FrameDetachType::Swap);
 
-    // Finally, clone the state of the current Frame into one matching
-    // the type of the passed in WebFrame.
+    // Clone the state of the current Frame into the one being swapped in.
     // FIXME: This is a bit clunky; this results in pointless decrements and
     // increments of connected subframes.
     if (frame->isWebLocalFrame()) {
+        // TODO(dcheng): in an ideal world, both branches would just use
+        // WebFrameImplBase's initializeCoreFrame() helper. However, Blink
+        // currently requires a 'provisional' local frame to serve as a
+        // placeholder for loading state when swapping to a local frame.
+        // In this case, the core LocalFrame is already initialized, so just
+        // update a bit of state.
         LocalFrame& localFrame = *toWebLocalFrameImpl(frame)->frame();
         ASSERT(owner == localFrame.owner());
         if (owner) {
-            if (owner->isLocal()) {
-                HTMLFrameOwnerElement* ownerElement = toHTMLFrameOwnerElement(owner);
-                ownerElement->setContentFrame(localFrame);
-                ownerElement->setWidget(localFrame.view());
-            } else {
-                toRemoteBridgeFrameOwner(owner)->setContentFrame(toWebLocalFrameImpl(frame));
-            }
+            owner->setContentFrame(localFrame);
+            if (owner->isLocal())
+                toHTMLFrameOwnerElement(owner)->setWidget(localFrame.view());
         } else {
             localFrame.page()->setMainFrame(&localFrame);
         }
     } else {
         toWebRemoteFrameImpl(frame)->initializeCoreFrame(host, owner, name, uniqueName);
     }
 
     frame->toImplBase()->frame()->getWindowProxyManager()->setGlobals(globals);
 
     m_parent = nullptr;
@@ skipping 246 matching lines @@
     void WebFrame::traceFrames(VisitorDispatcher visitor, WebFrame* frame) { traceFramesImpl(visitor, frame); }                \
     void WebFrame::clearWeakFrames(VisitorDispatcher visitor) { clearWeakFramesImpl(visitor); }
 
 DEFINE_VISITOR_METHOD(Visitor*)
 DEFINE_VISITOR_METHOD(InlinedGlobalMarkingVisitor)
 
 #undef DEFINE_VISITOR_METHOD
 #endif
 
 } // namespace blink