Revert of Streamline frame detach

Source/core/frame/Frame.cpp

Index: Source/core/frame/Frame.cpp
diff --git a/Source/core/frame/Frame.cpp b/Source/core/frame/Frame.cpp
index 7a4d3ff5fd9631e48a15b617b5a69f7eae3bb604..302a3e1e1328c2dd483c8800fa04416b5323c0b4 100644
--- a/Source/core/frame/Frame.cpp
+++ b/Source/core/frame/Frame.cpp
@@ -70,9 +70,8 @@
     frameCounter.increment();
 #endif
 
-    m_host->incrementFrameCount();
-
     if (m_owner) {
+        page()->incrementSubframeCount();
         if (m_owner->isLocal())
             toHTMLFrameOwnerElement(m_owner)->setContentFrame(*this);
     } else {
@@ -101,24 +100,6 @@
     visitor->trace(m_host);
     visitor->trace(m_owner);
     visitor->trace(m_domWindow);
-}
-
-void Frame::detach()
-{
-    // client() should never be null because that means we somehow re-entered
-    // the frame detach code... but it is sometimes.
-    // FIXME: Understand why this is happening so we can document this insanity.
-    // http://crbug.com/371084 is a probable explanation.
-    if (!client())
-        return;
-    // FIXME: Should we enforce the invariant that all pointers nulled in this function
-    // get nulled at the same time?
-    m_host->decrementFrameCount();
-    m_host = nullptr;
-    // After this, we must no longer talk to the client since this clears
-    // its owning reference back to our owning LocalFrame.
-    m_client->detached();
-    m_client = nullptr;
 }
 
 void Frame::detachChildren()
@@ -225,6 +206,8 @@
     if (m_owner) {
         if (m_owner->isLocal())
             toHTMLFrameOwnerElement(m_owner)->clearContentFrame();
+        if (page())
+            page()->decrementSubframeCount();
     }
     m_owner = nullptr;
 }