Add a layer of indirection between Frame and Page

Source/core/page/Page.h

Index: Source/core/page/Page.h
diff --git a/Source/core/page/Page.h b/Source/core/page/Page.h
index da31488e3f5af67dbb02a8ece7cba5eb51c05ac5..6442ee33d1b5d23ebc7c7b33a13e217f58a50928 100644
--- a/Source/core/page/Page.h
+++ b/Source/core/page/Page.h
@@ -52,6 +52,7 @@ class DragController;
 class EditorClient;
 class FocusController;
 class Frame;
+class FrameHost;
 class FrameSelection;
 class HaltablePlugin;
 class HistoryItem;
@@ -108,6 +109,8 @@ public:
     explicit Page(PageClients&);
     ~Page();
 
+    FrameHost& frameHost() { return *m_frameHost; }
+
     void setNeedsRecalcStyleInAllFrames();
 
     ViewportDescription viewportDescription() const;
@@ -129,6 +132,7 @@ public:
     bool openedByDOM() const;
     void setOpenedByDOM();
 
+    // FIXME: PageGroup should probably just be removed, see comment in PageGroup.h
     enum PageGroupType { PrivatePageGroup, SharedPageGroup };
     void setGroupType(PageGroupType);
     void clearPageGroup();
@@ -299,6 +303,10 @@ private:
     const OwnPtr<PageConsole> m_console;
 
     HashSet<MultisamplingChangedObserver*> m_multisamplingChangedObservers;
+
+    // A pointer to all the interfaces provided to in-process Frames for this Page.
+    // FIXME: Most of the members of Page should move onto FrameHost.
+    OwnPtr<FrameHost> m_frameHost;
 };
 
 } // namespace WebCore