Reland "Streamline frame detach"

Source/web/WebFrame.cpp

Index: Source/web/WebFrame.cpp
diff --git a/Source/web/WebFrame.cpp b/Source/web/WebFrame.cpp
index c11f2e11122518e8ec0030f07e42c33a4bc5db89..3b036b1024d927b4d0c5bec2ce81b97dc8a16704 100644
--- a/Source/web/WebFrame.cpp
+++ b/Source/web/WebFrame.cpp
@@ -74,15 +74,11 @@ bool WebFrame::swap(WebFrame* frame)
 
     // 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 (frame->isWebLocalFrame())
         toWebLocalFrameImpl(frame)->initializeCoreFrame(oldFrame->host(), owner, oldFrame->tree().name(), nullAtom);
-    } else {
+    else
         toWebRemoteFrameImpl(frame)->initializeCoreFrame(oldFrame->host(), owner, oldFrame->tree().name());
-    }
 
     return true;
 }