Change Frame to store a Page instead of a FrameHost.

third_party/WebKit/Source/core/frame/Frame.cpp

 /*
  * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org>
  *                     1999 Lars Knoll <knoll@kde.org>
  *                     1999 Antti Koivisto <koivisto@kde.org>
  *                     2000 Simon Hausmann <hausmann@kde.org>
  *                     2000 Stefan Schimanski <1Stein@gmx.de>
  *                     2001 George Staikos <staikos@kde.org>
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All
  * rights reserved.
  * Copyright (C) 2005 Alexey Proskuryakov <ap@nypop.com>
@@ skipping 45 matching lines @@
 
 using namespace HTMLNames;
 
 Frame::~Frame() {
   InstanceCounters::decrementCounter(InstanceCounters::FrameCounter);
   ASSERT(!m_owner);
 }
 
 DEFINE_TRACE(Frame) {
   visitor->trace(m_treeNode);
-  visitor->trace(m_host);
+  visitor->trace(m_page);
   visitor->trace(m_owner);
   visitor->trace(m_windowProxyManager);
   visitor->trace(m_domWindow);
   visitor->trace(m_client);
 }
 
 void Frame::detach(FrameDetachType type) {
   ASSERT(m_client);
   m_client->setOpener(0);
   disconnectOwnerElement();
   // After this, we must no longer talk to the client since this clears
   // its owning reference back to our owning LocalFrame.
   m_client->detached(type);
   m_client = nullptr;
-  m_host = nullptr;
+  m_page = nullptr;
 }
 
 void Frame::disconnectOwnerElement() {
   if (m_owner) {
     // Ocassionally, provisional frames need to be detached, but it shouldn't
     // affect the frame tree structure. Make sure the frame owner's content
     // frame actually refers to this frame before clearing it.
     // TODO(dcheng): https://crbug.com/578349 tracks the cleanup for this once
     // it's no longer needed.
     if (m_owner->contentFrame() == this)
       m_owner->clearContentFrame();
     m_owner = nullptr;
   }
 }
 
 Page* Frame::page() const {
-  if (m_host)
-    return &m_host->page();
+  return m_page;
+}
+
+FrameHost* Frame::host() const {
+  if (m_page)
+    return &m_page->frameHost();
   return nullptr;
 }
 
-FrameHost* Frame::host() const {
-  return m_host;
-}
-
 bool Frame::isMainFrame() const {
   return !tree().parent();
 }
 
 bool Frame::isLocalRoot() const {
   if (isRemoteFrame())
     return false;
 
   if (!tree().parent())
     return true;
@@ skipping 295 matching lines @@
   WebFeaturePolicy* featurePolicy = securityContext()->getFeaturePolicy();
   // The policy should always be initialized before checking it to ensure we
   // properly inherit the parent policy.
   DCHECK(featurePolicy);
 
   // Otherwise, check policy.
   return featurePolicy->IsFeatureEnabled(feature);
 }
 
 Frame::Frame(FrameClient* client,
-             FrameHost* host,
+             Page* page,
              FrameOwner* owner,
              WindowProxyManager* windowProxyManager)
     : m_treeNode(this),
-      m_host(host),
+      m_page(page),
       m_owner(owner),
       m_client(client),
       m_windowProxyManager(windowProxyManager),
       m_isLoading(false) {
   InstanceCounters::incrementCounter(InstanceCounters::FrameCounter);
 
-  ASSERT(page());
+  DCHECK(m_page);
 
   if (m_owner)
     m_owner->setContentFrame(*this);
   else
-    page()->setMainFrame(this);
+    m_page->setMainFrame(this);
 }
 
 }  // namespace blink