Revert of Detach old frame on WebFrame::swap.

Source/core/frame/Frame.cpp

 /*
  * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org>
  *                     1999 Lars Knoll <knoll@kde.org>
  *                     1999 Antti Koivisto <koivisto@kde.org>
  *                     2000 Simon Hausmann <hausmann@kde.org>
  *                     2000 Stefan Schimanski <1Stein@gmx.de>
  *                     2001 George Staikos <staikos@kde.org>
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2005 Alexey Proskuryakov <ap@nypop.com>
  * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
@@ skipping 62 matching lines @@
 #endif
 }
 
 DEFINE_TRACE(Frame)
 {
     visitor->trace(m_treeNode);
     visitor->trace(m_host);
     visitor->trace(m_owner);
 }
 
-void Frame::detach(FrameDetachType type)
+void Frame::detach()
 {
     ASSERT(m_client);
     domWindow()->resetLocation();
     disconnectOwnerElement();
     // After this, we must no longer talk to the client since this clears
     // its owning reference back to our owning LocalFrame.
-    m_client->detached(type);
+    m_client->detached();
     m_client = nullptr;
     m_host = nullptr;
 }
 
 void Frame::detachChildren()
 {
     typedef WillBeHeapVector<RefPtrWillBeMember<Frame>> FrameVector;
     FrameVector childrenToDetach;
     childrenToDetach.reserveCapacity(tree().childCount());
     for (Frame* child = tree().firstChild(); child; child = child->tree().nextSibling())
         childrenToDetach.append(child);
     for (const auto& child : childrenToDetach)
-        child->detach(FrameDetachType::Remove);
+        child->detach();
 }
 
 void Frame::disconnectOwnerElement()
 {
     if (m_owner) {
         if (m_owner->isLocal())
             toHTMLFrameOwnerElement(m_owner)->clearContentFrame();
     }
     m_owner = nullptr;
 }
@@ skipping 37 matching lines @@
     return client;
 }
 
 ChromeClient& Frame::chromeClient() const
 {
     if (Page* page = this->page())
         return page->chromeClient();
     return emptyChromeClient();
 }
 
-void Frame::prepareSwapFrom(Frame* old)
-{
-    WindowProxyManager* oldManager = old->windowProxyManager();
-    oldManager->clearForNavigation();
-}
-
 void Frame::finishSwapFrom(Frame* old)
 {
     WindowProxyManager* oldManager = old->windowProxyManager();
+    // FIXME: In the future, the Blink API layer will be calling detach() on the
+    // old frame prior to completing the swap. However, detach calls
+    // clearForClose() instead of clearForNavigation(). Make sure this doesn't
+    // become a no-op when that lands, since it's important to detach the global.
+    oldManager->clearForNavigation();
     windowProxyManager()->takeGlobalFrom(oldManager);
 }
 
 Frame* Frame::findFrameForNavigation(const AtomicString& name, Frame& activeFrame)
 {
     Frame* frame = tree().find(name);
     if (!frame || !activeFrame.canNavigate(*frame))
         return nullptr;
     return frame;
 }
@@ skipping 127 matching lines @@
 
     if (m_owner) {
         if (m_owner->isLocal())
             toHTMLFrameOwnerElement(m_owner)->setContentFrame(*this);
     } else {
         page()->setMainFrame(this);
     }
 }
 
 } // namespace blink