Moved FrameHost::m_visualViewport to Page

third_party/WebKit/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.
@@ skipping 89 matching lines @@
       m_chromeClient(pageClients.chromeClient),
       m_dragCaret(DragCaret::create()),
       m_dragController(DragController::create(this)),
       m_focusController(FocusController::create(this)),
       m_contextMenuController(
           ContextMenuController::create(this, pageClients.contextMenuClient)),
       m_pageScaleConstraintsSet(PageScaleConstraintsSet::create()),
       m_pointerLockController(PointerLockController::create(this)),
       m_browserControls(BrowserControls::create(*this)),
       m_eventHandlerRegistry(new EventHandlerRegistry(*this)),
+      m_visualViewport(VisualViewport::create(*this)),
       m_mainFrame(nullptr),
       m_editorClient(pageClients.editorClient),
       m_spellCheckerClient(pageClients.spellCheckerClient),
       m_useCounter(pageClients.chromeClient &&
                            pageClients.chromeClient->isSVGImageChromeClient()
                        ? UseCounter::SVGImageContext
                        : UseCounter::DefaultContext),
       m_openedByDOM(false),
       m_tabKeyCyclesThroughElements(true),
       m_suspended(false),
@@ skipping 54 matching lines @@
 }
 
 EventHandlerRegistry& Page::eventHandlerRegistry() {
   return *m_eventHandlerRegistry;
 }
 
 const EventHandlerRegistry& Page::eventHandlerRegistry() const {
   return *m_eventHandlerRegistry;
 }
 
+VisualViewport& Page::visualViewport() {
+  return *m_visualViewport;
+}
+
+const VisualViewport& Page::visualViewport() const {
+  return *m_visualViewport;
+}
+
 ClientRectList* Page::nonFastScrollableRects(const LocalFrame* frame) {
   DisableCompositingQueryAsserts disabler;
   if (ScrollingCoordinator* scrollingCoordinator =
           this->scrollingCoordinator()) {
     // Hits in compositing/iframes/iframe-composited-scrolling.html
     scrollingCoordinator->updateAfterCompositingChangeIfNeeded();
   }
 
   GraphicsLayer* layer =
       frame->view()->layoutViewportScrollableArea()->layerForScrolling();
@@ skipping 119 matching lines @@
 
   FrameView* rootView = deprecatedLocalMainFrame()->view();
 
   if (!rootView)
     return;
 
   rootView->setNeedsLayout();
 }
 
 void Page::setPageScaleFactor(float scale) {
-  frameHost().visualViewport().setScale(scale);
+  visualViewport().setScale(scale);
 }
 
 float Page::pageScaleFactor() const {
-  return frameHost().visualViewport().scale();
+  return visualViewport().scale();
 }
 
 void Page::setDeviceScaleFactorDeprecated(float scaleFactor) {
   if (m_deviceScaleFactor == scaleFactor)
     return;
 
   m_deviceScaleFactor = scaleFactor;
 
   if (mainFrame() && mainFrame()->isLocalFrame())
     deprecatedLocalMainFrame()->deviceScaleFactorChanged();
@@ skipping 177 matching lines @@
   if (m_mainFrame == frame) {
     KURL url;
     if (frame->document())
       url = frame->document()->url();
 
     // TODO(rbyers): Most of this doesn't appear to take into account that each
     // SVGImage gets it's own Page instance.
     frameHost().consoleMessageStorage().clear();
     useCounter().didCommitLoad(url);
     deprecation().clearSuppression();
-    frameHost().visualViewport().sendUMAMetrics();
+    visualViewport().sendUMAMetrics();
 
     // Need to reset visual viewport position here since before commit load we
     // would update the previous history item, Page::didCommitLoad is called
     // after a new history item is created in FrameLoader.
     // See crbug.com/642279
-    frameHost().visualViewport().setScrollOffset(ScrollOffset(),
-                                                 ProgrammaticScroll);
+    visualViewport().setScrollOffset(ScrollOffset(), ProgrammaticScroll);
     m_hostsUsingFeatures.updateMeasurementsAndClear();
   }
 }
 
 void Page::acceptLanguagesChanged() {
   HeapVector<Member<LocalFrame>> frames;
 
   // Even though we don't fire an event from here, the LocalDOMWindow's will
   // fire an event so we keep the frames alive until we are done.
   for (Frame* frame = mainFrame(); frame;
@@ skipping 11 matching lines @@
   visitor->trace(m_autoscrollController);
   visitor->trace(m_chromeClient);
   visitor->trace(m_dragCaret);
   visitor->trace(m_dragController);
   visitor->trace(m_focusController);
   visitor->trace(m_contextMenuController);
   visitor->trace(m_pointerLockController);
   visitor->trace(m_scrollingCoordinator);
   visitor->trace(m_browserControls);
   visitor->trace(m_eventHandlerRegistry);
+  visitor->trace(m_visualViewport);
   visitor->trace(m_mainFrame);
   visitor->trace(m_validationMessageClient);
   visitor->trace(m_useCounter);
   visitor->trace(m_frameHost);
   Supplementable<Page>::trace(visitor);
   PageVisibilityNotifier::trace(visitor);
 }
 
 void Page::layerTreeViewInitialized(WebLayerTreeView& layerTreeView,
                                     FrameView* view) {
@@ skipping 31 matching lines @@
     : chromeClient(nullptr),
       contextMenuClient(nullptr),
       editorClient(nullptr),
       spellCheckerClient(nullptr) {}
 
 Page::PageClients::~PageClients() {}
 
 template class CORE_TEMPLATE_EXPORT Supplement<Page>;
 
 }  // namespace blink