Moved FrameHost::m_visualViewport to Page

third_party/WebKit/Source/core/page/scrolling/ScrollingCoordinator.cpp

 /*
  * Copyright (C) 2011 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 217 matching lines @@
     if (!RuntimeEnabledFeatures::rootLayerScrollingEnabled())
       layoutViewportScrollLayer->setBounds(frameView->contentsSize());
 
     // If there is a non-root fullscreen element, prevent the viewport from
     // scrolling.
     Document* mainFrameDocument =
         m_page->deprecatedLocalMainFrame()->document();
     Element* fullscreenElement =
         Fullscreen::fullscreenElementFrom(*mainFrameDocument);
     WebLayer* visualViewportScrollLayer =
-        toWebLayer(m_page->frameHost().visualViewport().scrollLayer());
+        toWebLayer(m_page->visualViewport().scrollLayer());
 
     if (visualViewportScrollLayer) {
       if (fullscreenElement &&
           fullscreenElement != mainFrameDocument->documentElement())
         visualViewportScrollLayer->setUserScrollable(false, false);
       else
         visualViewportScrollLayer->setUserScrollable(true, true);
     }
 
     if (!RuntimeEnabledFeatures::rootLayerScrollingEnabled()) {
@@ skipping 229 matching lines @@
 }
 
 bool ScrollingCoordinator::scrollableAreaScrollLayerDidChange(
     ScrollableArea* scrollableArea) {
   if (!m_page || !m_page->mainFrame())
     return false;
 
   GraphicsLayer* scrollLayer = scrollableArea->layerForScrolling();
 
   if (scrollLayer) {
-    bool isForVisualViewport =
-        scrollableArea == &m_page->frameHost().visualViewport();
+    bool isForVisualViewport = scrollableArea == &m_page->visualViewport();
     scrollLayer->setScrollableArea(scrollableArea, isForVisualViewport);
   }
 
   WebLayer* webLayer = toWebLayer(scrollableArea->layerForScrolling());
   WebLayer* containerLayer = toWebLayer(scrollableArea->layerForContainer());
   if (webLayer) {
     webLayer->setScrollClipLayer(containerLayer);
     FloatPoint scrollPosition(scrollableArea->scrollOrigin() +
                               scrollableArea->getScrollOffset());
     webLayer->setScrollPosition(scrollPosition);
@@ skipping 333 matching lines @@
 void ScrollingCoordinator::willDestroyLayer(PaintLayer* layer) {
   m_layersWithTouchRects.erase(layer);
 }
 
 void ScrollingCoordinator::setShouldUpdateScrollLayerPositionOnMainThread(
     MainThreadScrollingReasons mainThreadScrollingReasons) {
   if (!m_page->mainFrame()->isLocalFrame() ||
       !m_page->deprecatedLocalMainFrame()->view())
     return;
 
-  GraphicsLayer* visualViewportLayer =
-      m_page->frameHost().visualViewport().scrollLayer();
+  GraphicsLayer* visualViewportLayer = m_page->visualViewport().scrollLayer();
   WebLayer* visualViewportScrollLayer = toWebLayer(visualViewportLayer);
   GraphicsLayer* layer = m_page->deprecatedLocalMainFrame()
                              ->view()
                              ->layoutViewportScrollableArea()
                              ->layerForScrolling();
   if (WebLayer* scrollLayer = toWebLayer(layer)) {
     m_lastMainThreadScrollingReasons = mainThreadScrollingReasons;
     if (mainThreadScrollingReasons) {
       ScrollableArea* scrollableArea = layer->getScrollableArea();
       if (scrollableArea) {
@@ skipping 340 matching lines @@
           frameView ? toWebLayer(frameView->layoutViewportScrollableArea()
                                      ->layerForScrolling())
                     : nullptr) {
     return WebSize(frameView->layoutViewportScrollableArea()->contentsSize()) !=
            scrollLayer->bounds();
   }
   return false;
 }
 
 }  // namespace blink