Add a layer of indirection between Frame and Page

Source/web/WebFrameImpl.cpp

 /*
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 2112 matching lines @@
 }
 
 void WebFrameImpl::setWebCoreFrame(WebCore::Frame* frame)
 {
     ASSERT(frame);
     observeFrame(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());
 
     // Add reference on behalf of FrameLoader. See comments in
     // WebFrameLoaderClient::frameLoaderDestroyed for more info.
     ref();
 
     // We must call init() after m_frame is assigned because it is referenced
     // during init().
     frame()->init();
@@ skipping 18 matching lines @@
         mustCallDidCreateFrame = true;
         webframeLifetimeHack = adoptRef(WebFrameImpl::create(m_client));
         webframe = webframeLifetimeHack.get();
     }
 
     // Add an extra ref on behalf of the page/FrameLoader, which references the
     // WebFrame via the FrameLoaderClient interface. See the comment at the top
     // 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());
 
     childFrame->tree().setName(request.frameName());
 
     frame()->tree().appendChild(childFrame);
 
     // FIXME: Remove once all embedders return non-null from createChildFrame().
     if (mustCallDidCreateFrame)
@@ skipping 317 matching lines @@
     ScriptValue result = frame()->script().executeScriptInMainWorldAndReturnValue(ScriptSourceCode(script));
 
     String scriptResult;
     if (!result.getString(scriptResult))
         return;
 
     if (!frame()->navigationScheduler().locationChangePending())
         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;
 
     // Do not expect string scoping results from any frames that got detached
     // in the middle of the operation.
     if (m_scopingInProgress) {
 
         // There is a possibility that the frame being detached was the only
         // pending one. We need to make sure final replies can be sent.
         flushCurrentScopingEffort(m_findRequestIdentifier);
 
         cancelPendingScopingEffort();
     }
 }
 
 } // namespace blink