Moved FrameHost::m_visualViewport to Page

third_party/WebKit/Source/web/tests/ScrollingCoordinatorTest.cpp

 /*
  * Copyright (C) 2012 Google 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 144 matching lines @@
   ASSERT_TRUE(rootScrollLayer->scrollable());
   ASSERT_FALSE(rootScrollLayer->shouldScrollOnMainThread());
   ASSERT_EQ(WebEventListenerProperties::Nothing,
             webLayerTreeView()->eventListenerProperties(
                 WebEventListenerClass::TouchStartOrMove));
   ASSERT_EQ(WebEventListenerProperties::Nothing,
             webLayerTreeView()->eventListenerProperties(
                 WebEventListenerClass::MouseWheel));
 
   WebLayer* innerViewportScrollLayer =
-      page->frameHost().visualViewport().scrollLayer()->platformLayer();
+      page->visualViewport().scrollLayer()->platformLayer();
   ASSERT_TRUE(innerViewportScrollLayer->scrollable());
   ASSERT_FALSE(innerViewportScrollLayer->shouldScrollOnMainThread());
 }
 
 TEST_P(ScrollingCoordinatorTest, fastScrollingCanBeDisabledWithSetting) {
   webViewImpl()->resize(WebSize(800, 600));
   loadHTML("<div id='spacer' style='height: 1000px'></div>");
   webViewImpl()->settings()->setThreadedScrollingEnabled(false);
   forceFullCompositingUpdate();
 
   // Make sure the scrolling coordinator is active.
   FrameView* frameView = frame()->view();
   Page* page = frame()->page();
   ASSERT_TRUE(page->scrollingCoordinator());
   ASSERT_TRUE(page->scrollingCoordinator()->coordinatesScrollingForFrameView(
       frameView));
 
   // Main scrolling should be enabled with the setting override.
   WebLayer* rootScrollLayer = getRootScrollLayer();
   ASSERT_TRUE(rootScrollLayer);
   ASSERT_TRUE(rootScrollLayer->scrollable());
   ASSERT_TRUE(rootScrollLayer->shouldScrollOnMainThread());
 
   // Main scrolling should also propagate to inner viewport layer.
   WebLayer* innerViewportScrollLayer =
-      page->frameHost().visualViewport().scrollLayer()->platformLayer();
+      page->visualViewport().scrollLayer()->platformLayer();
   ASSERT_TRUE(innerViewportScrollLayer->scrollable());
   ASSERT_TRUE(innerViewportScrollLayer->shouldScrollOnMainThread());
 }
 
 TEST_P(ScrollingCoordinatorTest, fastFractionalScrollingDiv) {
   bool origFractionalOffsetsEnabled =
       RuntimeEnabledFeatures::fractionalScrollOffsetsEnabled();
   RuntimeEnabledFeatures::setFractionalScrollOffsetsEnabled(true);
 
   registerMockedHttpURLLoad("fractional-scroll-div.html");
@@ skipping 963 matching lines @@
             MainThreadScrollingReason::kHasOpacityAndLCDText |
                 MainThreadScrollingReason::kHasBorderRadius);
 }
 
 TEST_P(StyleRelatedMainThreadScrollingReasonTest, BoxShadowTest) {
   testStyle("box-shadow",
             MainThreadScrollingReason::kHasBoxShadowFromNonRootLayer);
 }
 
 }  // namespace blink