Add a layer of indirection between Frame and Page

Source/core/page/Page.cpp

 /*
  * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 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,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 14 matching lines @@
 #include "core/dom/StyleEngine.h"
 #include "core/dom/VisitedLinkState.h"
 #include "core/editing/Caret.h"
 #include "core/editing/UndoStack.h"
 #include "core/events/Event.h"
 #include "core/events/ThreadLocalEventNames.h"
 #include "core/fetch/ResourceFetcher.h"
 #include "core/frame/DOMTimer.h"
 #include "core/frame/DOMWindow.h"
 #include "core/frame/Frame.h"
+#include "core/frame/FrameHost.h"
 #include "core/frame/FrameView.h"
 #include "core/history/HistoryItem.h"
 #include "core/inspector/InspectorController.h"
 #include "core/inspector/InspectorInstrumentation.h"
 #include "core/loader/FrameLoader.h"
 #include "core/loader/ProgressTracker.h"
 #include "core/page/AutoscrollController.h"
 #include "core/page/Chrome.h"
 #include "core/page/ChromeClient.h"
 #include "core/page/ContextMenuController.h"
@@ skipping 78 matching lines @@
     , m_pageScaleFactor(1)
     , m_deviceScaleFactor(1)
     , m_group(0)
     , m_timerAlignmentInterval(DOMTimer::visiblePageAlignmentInterval())
     , m_visibilityState(PageVisibilityStateVisible)
     , m_isCursorVisible(true)
 #ifndef NDEBUG
     , m_isPainting(false)
 #endif
     , m_console(PageConsole::create(this))
+    , m_frameHost(FrameHost::create(*this))
 {
     ASSERT(m_editorClient);
 
     if (!allPages)
         allPages = new HashSet<Page*>;
 
     ASSERT(!allPages->contains(this));
     allPages->add(this);
 
 #ifndef NDEBUG
     pageCounter.increment();
 #endif
 }
 
 Page::~Page()
 {
     m_mainFrame->setView(0);
     clearPageGroup();
     allPages->remove(this);
 
     for (Frame* frame = mainFrame(); frame; frame = frame->tree().traverseNext()) {
-        frame->willDetachPage();
-        frame->detachFromPage();
+        frame->willDetachFrameHost();
+        frame->detachFromFrameHost();
     }
 
     m_inspectorController->inspectedPageDestroyed();
 
     if (m_scrollingCoordinator)
         m_scrollingCoordinator->pageDestroyed();
 
 #ifndef NDEBUG
     pageCounter.decrement();
 #endif
@@ skipping 385 matching lines @@
     , backForwardClient(0)
     , spellCheckerClient(0)
 {
 }
 
 Page::PageClients::~PageClients()
 {
 }
 
 } // namespace WebCore