Add a layer of indirection between Frame and Page

Source/core/loader/FrameLoader.cpp

Index: Source/core/loader/FrameLoader.cpp
diff --git a/Source/core/loader/FrameLoader.cpp b/Source/core/loader/FrameLoader.cpp
index 09b7e3fd9290e3520c37f4fb1c6389385e3566fd..9e7b4484b65c35d4659698f164ab0ef5a0a27e08 100644
--- a/Source/core/loader/FrameLoader.cpp
+++ b/Source/core/loader/FrameLoader.cpp
@@ -1032,13 +1032,14 @@ void FrameLoader::detachChildren()
 
 void FrameLoader::closeAndRemoveChild(Frame* child)
 {
+    // FIXME: All this code belongs up in Page!
     child->tree().detachFromParent();
 
     child->setView(0);
     if (child->ownerElement() && child->page())
         child->page()->decrementSubframeCount();
-    child->willDetachPage();
-    child->detachFromPage();
+    child->willDetachFrameHost();
+    child->detachFromFrameHost();
 
     m_frame->tree().removeChild(child);
 }
@@ -1114,13 +1115,14 @@ void FrameLoader::detachFromParent()
 
     m_progressTracker.clear();
 
+    // FIXME: All this code belongs up in Page.
     if (Frame* parent = m_frame->tree().parent()) {
         parent->loader().closeAndRemoveChild(m_frame);
         parent->loader().scheduleCheckCompleted();
     } else {
         m_frame->setView(0);
-        m_frame->willDetachPage();
-        m_frame->detachFromPage();
+        m_frame->willDetachFrameHost();
+        m_frame->detachFromFrameHost();
     }
 }