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 b32c0c08e3abbebca937c9eb76e33245a53cc1af..290b809fc78eaa70c67451d71e30bf4553c8844c 100644
--- a/Source/core/loader/FrameLoader.cpp
+++ b/Source/core/loader/FrameLoader.cpp
@@ -1034,13 +1034,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);
 }
@@ -1116,13 +1117,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();
     }
 }