Change Frame to store a Page instead of a FrameHost.

third_party/WebKit/Source/core/frame/LocalFrame.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 415 matching lines @@
   m_loader.clear();
   if (!client())
     return;
 
   client()->willBeDetached();
   // Notify ScriptController that the frame is closing, since its cleanup ends
   // up calling back to LocalFrameClient via WindowProxy.
   script().clearForClose();
   setView(nullptr);
 
-  m_host->page().eventHandlerRegistry().didRemoveAllEventHandlers(*domWindow());
+  m_page->eventHandlerRegistry().didRemoveAllEventHandlers(*domWindow());
 
   domWindow()->frameDestroyed();
 
   // TODO: Page should take care of updating focus/scrolling instead of Frame.
   // TODO: It's unclear as to why this is called more than once, but it is,
   // so page() could be null.
   if (page() && page()->focusController().focusedFrame() == this)
     page()->focusController().setFocusedFrame(nullptr);
 
   if (page() && page()->scrollingCoordinator() && m_view)
@@ skipping 252 matching lines @@
       SubtreeStyleChange,
       StyleChangeReasonForTracing::create(StyleChangeReason::Zoom));
   for (Frame* child = tree().firstChild(); child;
        child = child->tree().nextSibling()) {
     if (child->isLocalFrame())
       toLocalFrame(child)->deviceScaleFactorChanged();
   }
 }
 
 double LocalFrame::devicePixelRatio() const {
-  if (!m_host)
+  if (!m_page)
     return 0;
 
-  double ratio = m_host->page().deviceScaleFactorDeprecated();
+  double ratio = m_page->deviceScaleFactorDeprecated();
   ratio *= pageZoomFactor();
   return ratio;
 }
 
 std::unique_ptr<DragImage> LocalFrame::nodeImage(Node& node) {
   DraggedNodeImageBuilder imageNode(*this, node);
   return imageNode.createImage();
 }
 
 std::unique_ptr<DragImage> LocalFrame::dragImageForSelection(float opacity) {
@@ skipping 118 matching lines @@
 
 bool LocalFrame::shouldThrottleRendering() const {
   return view() && view()->shouldThrottleRendering();
 }
 
 inline LocalFrame::LocalFrame(LocalFrameClient* client,
                               FrameHost* host,
                               FrameOwner* owner,
                               InterfaceProvider* interfaceProvider,
                               InterfaceRegistry* interfaceRegistry)
-    : Frame(client, host, owner, LocalWindowProxyManager::create(*this)),
+    : Frame(client,
+            host ? &host->page() : nullptr,
+            owner,
+            LocalWindowProxyManager::create(*this)),
       m_frameScheduler(page()->chromeClient().createFrameScheduler(
           client->frameBlameContext())),
       m_loader(this),
       m_navigationScheduler(NavigationScheduler::create(this)),
       m_script(ScriptController::create(
           *this,
           *static_cast<LocalWindowProxyManager*>(getWindowProxyManager()))),
       m_editor(Editor::create(*this)),
       m_spellChecker(SpellChecker::create(*this)),
       m_selection(FrameSelection::create(*this)),
@@ skipping 51 matching lines @@
   if (m_frame && m_frame->client() && m_frame->client()->frameBlameContext())
     m_frame->client()->frameBlameContext()->Enter();
 }
 
 ScopedFrameBlamer::~ScopedFrameBlamer() {
   if (m_frame && m_frame->client() && m_frame->client()->frameBlameContext())
     m_frame->client()->frameBlameContext()->Leave();
 }
 
 }  // namespace blink