Moved FrameHost::m_visualViewport to Page

third_party/WebKit/Source/web/DevToolsEmulator.cpp

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "web/DevToolsEmulator.h"
 
 #include "core/frame/FrameHost.h"
 #include "core/frame/FrameView.h"
 #include "core/frame/Settings.h"
 #include "core/frame/VisualViewport.h"
@@ skipping 259 matching lines @@
   m_isOrientationEventEnabled =
       RuntimeEnabledFeatures::orientationEventEnabled();
   RuntimeEnabledFeatures::setOrientationEventEnabled(true);
   m_isMobileLayoutThemeEnabled =
       RuntimeEnabledFeatures::mobileLayoutThemeEnabled();
   RuntimeEnabledFeatures::setMobileLayoutThemeEnabled(true);
   ComputedStyle::invalidateInitialStyle();
   m_webViewImpl->page()->settings().setViewportStyle(WebViewportStyle::Mobile);
   m_webViewImpl->page()->settings().setViewportEnabled(true);
   m_webViewImpl->page()->settings().setViewportMetaEnabled(true);
-  m_webViewImpl->page()->frameHost().visualViewport().initializeScrollbars();
+  m_webViewImpl->page()->visualViewport().initializeScrollbars();
   m_webViewImpl->settings()->setShrinksViewportContentToFit(true);
   m_webViewImpl->page()->settings().setTextAutosizingEnabled(true);
   m_webViewImpl->page()->settings().setPreferCompositingToLCDTextEnabled(true);
   m_webViewImpl->page()->settings().setPluginsEnabled(false);
   m_webViewImpl->page()->settings().setAvailablePointerTypes(PointerTypeCoarse);
   m_webViewImpl->page()->settings().setPrimaryPointerType(PointerTypeCoarse);
   m_webViewImpl->page()->settings().setAvailableHoverTypes(HoverTypeOnDemand);
   m_webViewImpl->page()->settings().setPrimaryHoverType(HoverTypeOnDemand);
   m_webViewImpl->page()->settings().setMainFrameResizesAreOrientationChanges(
       true);
@@ skipping 15 matching lines @@
     return;
   RuntimeEnabledFeatures::setOverlayScrollbarsEnabled(
       m_isOverlayScrollbarsEnabled);
   RuntimeEnabledFeatures::setOrientationEventEnabled(
       m_isOrientationEventEnabled);
   RuntimeEnabledFeatures::setMobileLayoutThemeEnabled(
       m_isMobileLayoutThemeEnabled);
   ComputedStyle::invalidateInitialStyle();
   m_webViewImpl->page()->settings().setViewportEnabled(false);
   m_webViewImpl->page()->settings().setViewportMetaEnabled(false);
-  m_webViewImpl->page()->frameHost().visualViewport().initializeScrollbars();
+  m_webViewImpl->page()->visualViewport().initializeScrollbars();
   m_webViewImpl->settings()->setShrinksViewportContentToFit(false);
   m_webViewImpl->page()->settings().setTextAutosizingEnabled(
       m_embedderTextAutosizingEnabled);
   m_webViewImpl->page()->settings().setPreferCompositingToLCDTextEnabled(
       m_embedderPreferCompositingToLCDTextEnabled);
   m_webViewImpl->page()->settings().setViewportStyle(m_embedderViewportStyle);
   m_webViewImpl->page()->settings().setPluginsEnabled(m_embedderPluginsEnabled);
   m_webViewImpl->page()->settings().setAvailablePointerTypes(
       m_embedderAvailablePointerTypes);
   m_webViewImpl->page()->settings().setPrimaryPointerType(
@@ skipping 16 matching lines @@
 
 float DevToolsEmulator::compositorDeviceScaleFactor() const {
   if (m_deviceMetricsEnabled)
     return m_emulationParams.deviceScaleFactor;
   return m_webViewImpl->page()->deviceScaleFactorDeprecated();
 }
 
 void DevToolsEmulator::forceViewport(const WebFloatPoint& position,
                                      float scale) {
   GraphicsLayer* containerLayer =
-      m_webViewImpl->page()->frameHost().visualViewport().containerLayer();
+      m_webViewImpl->page()->visualViewport().containerLayer();
   if (!m_viewportOverride) {
     m_viewportOverride = ViewportOverride();
 
     // Disable clipping on the visual viewport layer, to ensure the whole area
     // is painted.
     if (containerLayer) {
       m_viewportOverride->originalVisualViewportMasking =
           containerLayer->masksToBounds();
       containerLayer->setMasksToBounds(false);
     }
   }
 
   m_viewportOverride->position = position;
   m_viewportOverride->scale = scale;
 
   // Move the correct (scaled) content area to show in the top left of the
   // CompositorFrame via the root transform.
   updateRootLayerTransform();
 }
 
 void DevToolsEmulator::resetViewport() {
   if (!m_viewportOverride)
     return;
 
   bool originalMasking = m_viewportOverride->originalVisualViewportMasking;
   m_viewportOverride = WTF::nullopt;
 
   GraphicsLayer* containerLayer =
-      m_webViewImpl->page()->frameHost().visualViewport().containerLayer();
+      m_webViewImpl->page()->visualViewport().containerLayer();
   if (containerLayer)
     containerLayer->setMasksToBounds(originalMasking);
   updateRootLayerTransform();
 }
 
 void DevToolsEmulator::mainFrameScrollOrScaleChanged() {
   // Viewport override has to take current page scale and scroll offset into
   // account. Update the transform if override is active.
   if (m_viewportOverride)
     updateRootLayerTransform();
@@ skipping 138 matching lines @@
       m_lastPinchAnchorCss.reset();
       m_lastPinchAnchorDip.reset();
     }
     return true;
   }
 
   return false;
 }
 
 }  // namespace blink