Add a layer of indirection between Frame and Page

Source/web/WebFrameImpl.cpp

Index: Source/web/WebFrameImpl.cpp
diff --git a/Source/web/WebFrameImpl.cpp b/Source/web/WebFrameImpl.cpp
index e3c40ff6826d0bb5eb879ffd71b41b8a2f1a822b..c7c88fea487d40a268318b2e23600b1d0a8792f5 100644
--- a/Source/web/WebFrameImpl.cpp
+++ b/Source/web/WebFrameImpl.cpp
@@ -2130,7 +2130,10 @@ void WebFrameImpl::setWebCoreFrame(WebCore::Frame* frame)
 
 void WebFrameImpl::initializeAsMainFrame(WebCore::Page* page)
 {
-    m_frameInit->setPage(page);
+    // FIXME: This whole function can go away once ownerhip of WebFrame is reversed.
+    // Page should create it's main WebFrame, not have FrameLoader do it only
+    // to have to mark the frame as main later.
+    m_frameInit->setFrameHost(&page->frameHost());
     RefPtr<Frame> mainFrame = Frame::create(m_frameInit);
     setWebCoreFrame(mainFrame.get());
 
@@ -2169,7 +2172,7 @@ PassRefPtr<Frame> WebFrameImpl::createChildFrame(const FrameLoadRequest& request
     // of this file for more info.
     webframe->ref();
 
-    webframe->m_frameInit->setPage(frame()->page());
+    webframe->m_frameInit->setFrameHost(frame()->host());
     webframe->m_frameInit->setOwnerElement(ownerElement);
     RefPtr<Frame> childFrame = Frame::create(webframe->m_frameInit);
     webframe->setWebCoreFrame(childFrame.get());
@@ -2507,8 +2510,9 @@ void WebFrameImpl::loadJavaScriptURL(const KURL& url)
         frame()->document()->loader()->replaceDocument(scriptResult, ownerDocument.get());
 }
 
-void WebFrameImpl::willDetachPage()
+void WebFrameImpl::willDetachFrameHost()
 {
+    // FIXME: This should never be called if the Frame has already been detached?
     if (!frame() || !frame()->page())
         return;