Moved FrameHost::m_visualViewport to Page

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

 /*
  * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org>
  *                     1999 Lars Knoll <knoll@kde.org>
  *                     1999 Antti Koivisto <koivisto@kde.org>
  *                     2000 Dirk Mueller <mueller@kde.org>
  * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
  *           (C) 2006 Graham Dennis (graham.dennis@gmail.com)
  *           (C) 2006 Alexey Proskuryakov (ap@nypop.com)
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
@@ skipping 546 matching lines @@
   }
 
   if (auto layoutViewItem = this->layoutViewItem())
     layoutViewItem.setMayNeedPaintInvalidation();
 
   if (frameSizeChanged) {
     viewportSizeChanged(newRect.width() != oldRect.width(),
                         newRect.height() != oldRect.height());
 
     if (m_frame->isMainFrame())
-      m_frame->host()->visualViewport().mainFrameDidChangeSize();
+      m_frame->page()->visualViewport().mainFrameDidChangeSize();
 
     frame().loader().restoreScrollPositionAndViewState();
   }
 }
 
 Page* FrameView::page() const {
   return frame().page();
 }
 
 LayoutView* FrameView::layoutView() const {
@@ skipping 842 matching lines @@
   BrowserControls& browserControls = m_frame->page()->browserControls();
   if (RuntimeEnabledFeatures::inertTopControlsEnabled() &&
       browserControls.permittedState() != WebBrowserControlsHidden) {
     // We use the layoutSize rather than frameRect to calculate viewport units
     // so that we get correct results on mobile where the page is laid out into
     // a rect that may be larger than the viewport (e.g. the 980px fallback
     // width for desktop pages). Since the layout height is statically set to
     // be the viewport with browser controls showing, we add the browser
     // controls height, compensating for page scale as well, since we want to
     // use the viewport with browser controls hidden for vh (to match Safari).
-    int viewportWidth = m_frame->host()->visualViewport().size().width();
+    int viewportWidth = m_frame->page()->visualViewport().size().width();
     if (m_frame->isMainFrame() && layoutSize.width() && viewportWidth) {
       float pageScaleAtLayoutWidth = viewportWidth / layoutSize.width();
       layoutSize.expand(0, browserControls.height() / pageScaleAtLayoutWidth);
     }
   }
 
   return layoutSize;
 }
 
 FloatSize FrameView::viewportSizeForMediaQueries() const {
@@ skipping 1166 matching lines @@
                                                     float contentScaleFactor) {
   m_inputEventsOffsetForEmulation = offset;
   m_inputEventsScaleFactorForEmulation = contentScaleFactor;
 }
 
 IntSize FrameView::inputEventsOffsetForEmulation() const {
   return m_inputEventsOffsetForEmulation;
 }
 
 float FrameView::inputEventsScaleFactor() const {
-  float pageScale = m_frame->host()->visualViewport().scale();
+  float pageScale = m_frame->page()->visualViewport().scale();
   return pageScale * m_inputEventsScaleFactorForEmulation;
 }
 
 bool FrameView::scrollbarsCanBeActive() const {
   if (m_frame->view() != this)
     return false;
 
   return !!m_frame->document();
 }
 
@@ skipping 124 matching lines @@
     page->chromeClient().annotatedRegionsChanged();
 }
 
 void FrameView::didAttachDocument() {
   FrameHost* frameHost = m_frame->host();
   DCHECK(frameHost);
 
   DCHECK(m_frame->document());
 
   if (m_frame->isMainFrame()) {
-    ScrollableArea& visualViewport = frameHost->visualViewport();
+    ScrollableArea& visualViewport = m_frame->page()->visualViewport();
     ScrollableArea* layoutViewport = layoutViewportScrollableArea();
     DCHECK(layoutViewport);
 
     RootFrameViewport* rootFrameViewport =
         RootFrameViewport::create(visualViewport, *layoutViewport);
     m_viewportScrollableArea = rootFrameViewport;
 
     frameHost->globalRootScrollerController().initializeViewportScrollCallback(
         *rootFrameViewport);
   }
@@ skipping 1598 matching lines @@
 }
 
 FloatPoint FrameView::rootFrameToContents(
     const FloatPoint& pointInRootFrame) const {
   FloatPoint framePoint = convertFromRootFrame(pointInRootFrame);
   return frameToContents(framePoint);
 }
 
 IntRect FrameView::viewportToContents(const IntRect& rectInViewport) const {
   IntRect rectInRootFrame =
-      m_frame->host()->visualViewport().viewportToRootFrame(rectInViewport);
+      m_frame->page()->visualViewport().viewportToRootFrame(rectInViewport);
   IntRect frameRect = convertFromRootFrame(rectInRootFrame);
   return frameToContents(frameRect);
 }
 
 IntPoint FrameView::viewportToContents(const IntPoint& pointInViewport) const {
   IntPoint pointInRootFrame =
-      m_frame->host()->visualViewport().viewportToRootFrame(pointInViewport);
+      m_frame->page()->visualViewport().viewportToRootFrame(pointInViewport);
   IntPoint pointInFrame = convertFromRootFrame(pointInRootFrame);
   return frameToContents(pointInFrame);
 }
 
 IntRect FrameView::contentsToViewport(const IntRect& rectInContents) const {
   IntRect rectInFrame = contentsToFrame(rectInContents);
   IntRect rectInRootFrame = convertToRootFrame(rectInFrame);
-  return m_frame->host()->visualViewport().rootFrameToViewport(rectInRootFrame);
+  return m_frame->page()->visualViewport().rootFrameToViewport(rectInRootFrame);
 }
 
 IntPoint FrameView::contentsToViewport(const IntPoint& pointInContents) const {
   IntPoint pointInFrame = contentsToFrame(pointInContents);
   IntPoint pointInRootFrame = convertToRootFrame(pointInFrame);
-  return m_frame->host()->visualViewport().rootFrameToViewport(
+  return m_frame->page()->visualViewport().rootFrameToViewport(
       pointInRootFrame);
 }
 
 IntRect FrameView::contentsToScreen(const IntRect& rect) const {
   HostWindow* window = getHostWindow();
   if (!window)
     return IntRect();
   return window->viewportToScreen(contentsToViewport(rect), this);
 }
 
 IntPoint FrameView::soonToBeRemovedUnscaledViewportToContents(
     const IntPoint& pointInViewport) const {
   IntPoint pointInRootFrame = flooredIntPoint(
-      m_frame->host()->visualViewport().viewportCSSPixelsToRootFrame(
+      m_frame->page()->visualViewport().viewportCSSPixelsToRootFrame(
           pointInViewport));
   IntPoint pointInThisFrame = convertFromRootFrame(pointInRootFrame);
   return frameToContents(pointInThisFrame);
 }
 
 Scrollbar* FrameView::scrollbarAtFramePoint(const IntPoint& pointInFrame) {
   if (horizontalScrollbar() &&
       horizontalScrollbar()->shouldParticipateInHitTesting() &&
       horizontalScrollbar()->frameRect().contains(pointInFrame))
     return horizontalScrollbar();
@@ skipping 834 matching lines @@
 void FrameView::setAnimationHost(
     std::unique_ptr<CompositorAnimationHost> host) {
   m_animationHost = std::move(host);
 }
 
 LayoutUnit FrameView::caretWidth() const {
   return LayoutUnit(getHostWindow()->windowToViewportScalar(1));
 }
 
 }  // namespace blink