Add a layer of indirection between Frame and Page

Source/core/page/Page.h

 /*
  * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2013 Apple Inc. All rights reserved.
  * Copyright (C) 2008 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
@@ skipping 34 matching lines @@
 class ClientRectList;
 class ContextMenuClient;
 class ContextMenuController;
 class Document;
 class DragCaretController;
 class DragClient;
 class DragController;
 class EditorClient;
 class FocusController;
 class Frame;
+class FrameHost;
 class FrameSelection;
 class HaltablePlugin;
 class HistoryItem;
 class InspectorClient;
 class InspectorController;
 class Node;
 class PageConsole;
 class PageGroup;
 class PageLifecycleNotifier;
 class PlatformMouseEvent;
@@ skipping 35 matching lines @@
         EditorClient* editorClient;
         DragClient* dragClient;
         InspectorClient* inspectorClient;
         BackForwardClient* backForwardClient;
         SpellCheckerClient* spellCheckerClient;
     };
 
     explicit Page(PageClients&);
     ~Page();
 
+    FrameHost& frameHost() { return *m_frameHost; }
+
     void setNeedsRecalcStyleInAllFrames();
 
     ViewportDescription viewportDescription() const;
 
     static void refreshPlugins(bool reload);
     PluginData* pluginData() const;
 
     EditorClient& editorClient() const { return *m_editorClient; }
     SpellCheckerClient& spellCheckerClient() const { return *m_spellCheckerClient; }
     UndoStack& undoStack() const { return *m_undoStack; }
 
     HistoryController& historyController() const { return *m_historyController; }
 
     void setMainFrame(PassRefPtr<Frame>);
     Frame* mainFrame() const { return m_mainFrame.get(); }
 
     void documentDetached(Document*);
 
     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();
     PageGroup& group()
     {
         if (!m_group)
             setGroupType(PrivatePageGroup);
         return *m_group;
     }
 
@@ skipping 150 matching lines @@
 
     bool m_isCursorVisible;
 
 #ifndef NDEBUG
     bool m_isPainting;
 #endif
 
     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
 
 #endif // Page_h