Moved FrameHost::m_visualViewport to Page

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

 // Copyright 2014 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 "core/frame/VisualViewport.h"
 
 #include "core/dom/Document.h"
 #include "core/frame/BrowserControls.h"
 #include "core/frame/FrameHost.h"
 #include "core/frame/FrameView.h"
@@ skipping 185 matching lines @@
 
 // Test that resizing the VisualViewport works as expected and that resizing the
 // WebView resizes the VisualViewport.
 TEST_P(VisualViewportTest, TestResize) {
   initializeWithDesktopSettings();
   webViewImpl()->resize(IntSize(320, 240));
 
   navigateTo("about:blank");
   forceFullCompositingUpdate();
 
-  VisualViewport& visualViewport =
-      frame()->page()->frameHost().visualViewport();
+  VisualViewport& visualViewport = frame()->page()->visualViewport();
 
   IntSize webViewSize = webViewImpl()->size();
 
   // Make sure the visual viewport was initialized.
   EXPECT_SIZE_EQ(webViewSize, visualViewport.size());
 
   // Resizing the WebView should change the VisualViewport.
   webViewSize = IntSize(640, 480);
   webViewImpl()->resize(webViewSize);
   EXPECT_SIZE_EQ(webViewSize, IntSize(webViewImpl()->size()));
@@ skipping 17 matching lines @@
 
   IntSize size = IntSize(150, 100);
   // Vertical scrollbar width and horizontal scrollbar height.
   IntSize scrollbarSize = IntSize(15, 15);
 
   webViewImpl()->resize(size);
 
   // Scroll layout viewport and verify visibleContentRect.
   webViewImpl()->mainFrame()->setScrollOffset(WebSize(0, 50));
 
-  VisualViewport& visualViewport =
-      frame()->page()->frameHost().visualViewport();
+  VisualViewport& visualViewport = frame()->page()->visualViewport();
   EXPECT_EQ(IntRect(IntPoint(0, 0), size - scrollbarSize),
             visualViewport.visibleContentRect(ExcludeScrollbars));
   EXPECT_EQ(IntRect(IntPoint(0, 0), size),
             visualViewport.visibleContentRect(IncludeScrollbars));
 
   webViewImpl()->setPageScaleFactor(2.0);
 
   // Scroll visual viewport and verify visibleContentRect.
   size.scale(0.5);
   scrollbarSize.scale(0.5);
@@ skipping 10 matching lines @@
 // the VisualViewport so we need to counter scroll the FrameView to make it
 // appear to stay still). This caused bugs like crbug.com/453859.
 TEST_P(VisualViewportTest, TestResizeAtFullyScrolledPreservesViewportLocation) {
   initializeWithDesktopSettings();
   webViewImpl()->resize(IntSize(800, 600));
 
   registerMockedHttpURLLoad("content-width-1000.html");
   navigateTo(m_baseURL + "content-width-1000.html");
 
   FrameView& frameView = *webViewImpl()->mainFrameImpl()->frameView();
-  VisualViewport& visualViewport =
-      frame()->page()->frameHost().visualViewport();
+  VisualViewport& visualViewport = frame()->page()->visualViewport();
 
   visualViewport.setScale(2);
 
   // Fully scroll both viewports.
   frameView.layoutViewportScrollableArea()->setScrollOffset(
       ScrollOffset(10000, 10000), ProgrammaticScroll);
   visualViewport.move(FloatSize(10000, 10000));
 
   // Sanity check.
   ASSERT_SIZE_EQ(FloatSize(400, 300), visualViewport.getScrollOffset());
@@ skipping 55 matching lines @@
 
   // Scroll main frame to the bottom of the document
   webViewImpl()->mainFrame()->setScrollOffset(WebSize(0, 400));
   EXPECT_SIZE_EQ(
       ScrollOffset(0, 400),
       frame()->view()->layoutViewportScrollableArea()->getScrollOffset());
 
   webViewImpl()->setPageScaleFactor(2.0);
 
   // Scroll visual viewport to the bottom of the main frame
-  VisualViewport& visualViewport =
-      frame()->page()->frameHost().visualViewport();
+  VisualViewport& visualViewport = frame()->page()->visualViewport();
   visualViewport.setLocation(FloatPoint(0, 300));
   EXPECT_FLOAT_SIZE_EQ(FloatSize(0, 300), visualViewport.getScrollOffset());
 
   // Verify the initial size of the visual viewport in the CSS pixels
   EXPECT_FLOAT_SIZE_EQ(FloatSize(50, 100), visualViewport.visibleRect().size());
 
   // Perform the resizing
   webViewImpl()->resize(IntSize(200, 100));
 
   // After resizing the scale changes 2.0 -> 4.0
@@ skipping 39 matching lines @@
   registerMockedHttpURLLoad("200-by-800-viewport.html");
   navigateTo(m_baseURL + "200-by-800-viewport.html");
 
   webViewImpl()->resize(IntSize(100, 200));
 
   // Outer viewport takes the whole width of the document.
 
   webViewImpl()->setPageScaleFactor(2.0);
 
   // Scroll visual viewport to the right edge of the frame
-  VisualViewport& visualViewport =
-      frame()->page()->frameHost().visualViewport();
+  VisualViewport& visualViewport = frame()->page()->visualViewport();
   visualViewport.setLocation(FloatPoint(150, 0));
   EXPECT_FLOAT_SIZE_EQ(FloatSize(150, 0), visualViewport.getScrollOffset());
 
   // Verify the initial size of the visual viewport in the CSS pixels
   EXPECT_FLOAT_SIZE_EQ(FloatSize(50, 100), visualViewport.visibleRect().size());
 
   webViewImpl()->resize(IntSize(200, 100));
 
   // After resizing the scale changes 2.0 -> 4.0
   EXPECT_FLOAT_SIZE_EQ(FloatSize(50, 25), visualViewport.visibleRect().size());
@@ skipping 13 matching lines @@
   WebFrameWidgetBase* mainFrameWidget =
       webViewImpl()->mainFrameImpl()->frameWidget();
   mainFrameWidget->setRootGraphicsLayer(nullptr);
   webViewImpl()->resize(IntSize(320, 240));
 
   navigateTo("about:blank");
   webViewImpl()->updateAllLifecyclePhases();
   mainFrameWidget->setRootGraphicsLayer(
       frameView.layoutViewItem().compositor()->rootGraphicsLayer());
 
-  VisualViewport& visualViewport =
-      frame()->page()->frameHost().visualViewport();
+  VisualViewport& visualViewport = frame()->page()->visualViewport();
   EXPECT_FLOAT_SIZE_EQ(FloatSize(320, 240),
                        visualViewport.containerLayer()->size());
 }
 
 // Make sure that the visibleRect method acurately reflects the scale and scroll
 // location of the viewport.
 TEST_P(VisualViewportTest, TestVisibleRect) {
   initializeWithDesktopSettings();
   webViewImpl()->resize(IntSize(320, 240));
 
   navigateTo("about:blank");
   forceFullCompositingUpdate();
 
-  VisualViewport& visualViewport =
-      frame()->page()->frameHost().visualViewport();
+  VisualViewport& visualViewport = frame()->page()->visualViewport();
 
   // Initial visible rect should be the whole frame.
   EXPECT_SIZE_EQ(IntSize(webViewImpl()->size()), visualViewport.size());
 
   // Viewport is whole frame.
   IntSize size = IntSize(400, 200);
   webViewImpl()->resize(size);
   webViewImpl()->updateAllLifecyclePhases();
   visualViewport.setSize(size);
 
@@ skipping 29 matching lines @@
 
 // Make sure that the visibleRectInDocument method acurately reflects the scale
 // and scroll location of the viewport relative to the document.
 TEST_P(VisualViewportTest, TestVisibleRectInDocument) {
   initializeWithDesktopSettings();
   webViewImpl()->resize(IntSize(100, 400));
 
   registerMockedHttpURLLoad("200-by-800-viewport.html");
   navigateTo(m_baseURL + "200-by-800-viewport.html");
 
-  VisualViewport& visualViewport =
-      frame()->page()->frameHost().visualViewport();
+  VisualViewport& visualViewport = frame()->page()->visualViewport();
 
   // Scale the viewport to 2X and move it.
   visualViewport.setScale(2);
   visualViewport.setLocation(FloatPoint(10, 15));
   EXPECT_FLOAT_RECT_EQ(FloatRect(10, 15, 50, 200),
                        visualViewport.visibleRectInDocument());
 
   // Scroll the layout viewport. Ensure its offset is reflected in
   // visibleRectInDocument().
   FrameView& frameView = *webViewImpl()->mainFrameImpl()->frameView();
@@ skipping 32 matching lines @@
 // that the visual viewport always stays within the bounds of the main frame.
 TEST_P(VisualViewportTest, TestOffsetClamping) {
   initializeWithDesktopSettings();
   webViewImpl()->resize(IntSize(320, 240));
 
   navigateTo("about:blank");
   forceFullCompositingUpdate();
 
   // Visual viewport should be initialized to same size as frame so no scrolling
   // possible.
-  VisualViewport& visualViewport =
-      frame()->page()->frameHost().visualViewport();
+  VisualViewport& visualViewport = frame()->page()->visualViewport();
   EXPECT_FLOAT_POINT_EQ(FloatPoint(0, 0),
                         visualViewport.visibleRect().location());
 
   visualViewport.setLocation(FloatPoint(-1, -2));
   EXPECT_FLOAT_POINT_EQ(FloatPoint(0, 0),
                         visualViewport.visibleRect().location());
 
   visualViewport.setLocation(FloatPoint(100, 200));
   EXPECT_FLOAT_POINT_EQ(FloatPoint(0, 0),
                         visualViewport.visibleRect().location());
@@ skipping 34 matching lines @@
 // keyboard came up.
 TEST_P(VisualViewportTest, TestOffsetClampingWithResize) {
   initializeWithDesktopSettings();
   webViewImpl()->resize(IntSize(320, 240));
 
   navigateTo("about:blank");
   forceFullCompositingUpdate();
 
   // Visual viewport should be initialized to same size as frame so no scrolling
   // possible.
-  VisualViewport& visualViewport =
-      frame()->page()->frameHost().visualViewport();
+  VisualViewport& visualViewport = frame()->page()->visualViewport();
   EXPECT_FLOAT_POINT_EQ(FloatPoint(0, 0),
                         visualViewport.visibleRect().location());
 
   // Shrink the viewport vertically. The resize shouldn't affect the location,
   // but it should allow vertical scrolling.
   visualViewport.setSize(IntSize(320, 200));
   EXPECT_FLOAT_POINT_EQ(FloatPoint(0, 0),
                         visualViewport.visibleRect().location());
   visualViewport.setLocation(FloatPoint(10, 20));
   EXPECT_FLOAT_POINT_EQ(FloatPoint(0, 20),
@@ skipping 47 matching lines @@
 // main frame when we apply both scaling and resizes.
 TEST_P(VisualViewportTest, TestOffsetClampingWithResizeAndScale) {
   initializeWithDesktopSettings();
   webViewImpl()->resize(IntSize(320, 240));
 
   navigateTo("about:blank");
   forceFullCompositingUpdate();
 
   // Visual viewport should be initialized to same size as WebView so no
   // scrolling possible.
-  VisualViewport& visualViewport =
-      frame()->page()->frameHost().visualViewport();
+  VisualViewport& visualViewport = frame()->page()->visualViewport();
   EXPECT_FLOAT_POINT_EQ(FloatPoint(0, 0),
                         visualViewport.visibleRect().location());
 
   // Zoom in to 2X so we can scroll the viewport to 160x120.
   visualViewport.setScale(2);
   visualViewport.setLocation(FloatPoint(200, 200));
   EXPECT_FLOAT_POINT_EQ(FloatPoint(160, 120),
                         visualViewport.visibleRect().location());
 
   // Now resize the viewport to make it 10px smaller. Since we're zoomed in by
@@ skipping 71 matching lines @@
 TEST_P(VisualViewportTest, TestAttachingNewFrameSetsInnerScrollLayerSize) {
   initializeWithAndroidSettings();
   webViewImpl()->resize(IntSize(320, 240));
 
   // Load a wider page first, the navigation should resize the scroll layer to
   // the smaller size on the second navigation.
   registerMockedHttpURLLoad("content-width-1000.html");
   navigateTo(m_baseURL + "content-width-1000.html");
   webViewImpl()->updateAllLifecyclePhases();
 
-  VisualViewport& visualViewport =
-      frame()->page()->frameHost().visualViewport();
+  VisualViewport& visualViewport = frame()->page()->visualViewport();
   visualViewport.setScale(2);
   visualViewport.move(ScrollOffset(50, 60));
 
   // Move and scale the viewport to make sure it gets reset in the navigation.
   EXPECT_SIZE_EQ(FloatSize(50, 60), visualViewport.getScrollOffset());
   EXPECT_EQ(2, visualViewport.scale());
 
   // Navigate again, this time the FrameView should be smaller.
   registerMockedHttpURLLoad("viewport-device-width.html");
   navigateTo(m_baseURL + "viewport-device-width.html");
@@ skipping 25 matching lines @@
   EXPECT_SIZE_EQ(
       IntSize(50, 80),
       webViewImpl()->mainFrameImpl()->frameView()->frameRect().size());
 }
 
 // Test that the visual viewport still gets sized in AutoSize/AutoResize mode.
 TEST_P(VisualViewportTest, TestVisualViewportGetsSizeInAutoSizeMode) {
   initializeWithDesktopSettings();
 
   EXPECT_SIZE_EQ(IntSize(0, 0), IntSize(webViewImpl()->size()));
-  EXPECT_SIZE_EQ(IntSize(0, 0),
-                 frame()->page()->frameHost().visualViewport().size());
+  EXPECT_SIZE_EQ(IntSize(0, 0), frame()->page()->visualViewport().size());
 
   webViewImpl()->enableAutoResizeMode(WebSize(10, 10), WebSize(1000, 1000));
 
   registerMockedHttpURLLoad("200-by-300.html");
   navigateTo(m_baseURL + "200-by-300.html");
 
-  EXPECT_SIZE_EQ(IntSize(200, 300),
-                 frame()->page()->frameHost().visualViewport().size());
+  EXPECT_SIZE_EQ(IntSize(200, 300), frame()->page()->visualViewport().size());
 }
 
 // Test that the text selection handle's position accounts for the visual
 // viewport.
 TEST_P(VisualViewportTest, TestTextSelectionHandles) {
   initializeWithDesktopSettings();
   webViewImpl()->resize(IntSize(500, 800));
 
   registerMockedHttpURLLoad("pinch-viewport-input-field.html");
   navigateTo(m_baseURL + "pinch-viewport-input-field.html");
 
-  VisualViewport& visualViewport =
-      frame()->page()->frameHost().visualViewport();
+  VisualViewport& visualViewport = frame()->page()->visualViewport();
   webViewImpl()->setInitialFocus(false);
 
   WebRect originalAnchor;
   WebRect originalFocus;
   webViewImpl()->selectionBounds(originalAnchor, originalFocus);
 
   webViewImpl()->setPageScaleFactor(2);
   visualViewport.setLocation(FloatPoint(100, 400));
 
   WebRect anchor;
@@ skipping 20 matching lines @@
 
   registerMockedHttpURLLoad("200-by-300.html");
   navigateTo(m_baseURL + "200-by-300.html");
 
   EXPECT_SIZE_EQ(ScrollOffset(0, 0),
                  toLocalFrame(webViewImpl()->page()->mainFrame())
                      ->loader()
                      .currentItem()
                      ->visualViewportScrollOffset());
 
-  VisualViewport& visualViewport =
-      frame()->page()->frameHost().visualViewport();
+  VisualViewport& visualViewport = frame()->page()->visualViewport();
   visualViewport.setScale(2);
 
   EXPECT_EQ(2, toLocalFrame(webViewImpl()->page()->mainFrame())
                    ->loader()
                    .currentItem()
                    ->pageScaleFactor());
 
   visualViewport.setLocation(FloatPoint(10, 20));
 
   EXPECT_SIZE_EQ(ScrollOffset(10, 20),
@@ skipping 14 matching lines @@
   item.initialize();
   WebURL destinationURL(URLTestHelpers::toKURL(m_baseURL + "200-by-300.html"));
   item.setURLString(destinationURL.string());
   item.setVisualViewportScrollOffset(WebFloatPoint(100, 120));
   item.setPageScaleFactor(2);
 
   FrameTestHelpers::loadHistoryItem(webViewImpl()->mainFrame(), item,
                                     WebHistoryDifferentDocumentLoad,
                                     WebCachePolicy::UseProtocolCachePolicy);
 
-  VisualViewport& visualViewport =
-      frame()->page()->frameHost().visualViewport();
+  VisualViewport& visualViewport = frame()->page()->visualViewport();
   EXPECT_EQ(2, visualViewport.scale());
 
   EXPECT_FLOAT_POINT_EQ(FloatPoint(100, 120),
                         visualViewport.visibleRect().location());
 }
 
 // Test restoring a HistoryItem without the visual viewport offset falls back to
 // distributing the scroll offset between the main frame and the visual
 // viewport.
 TEST_P(VisualViewportTest, TestRestoredFromLegacyHistoryItem) {
@@ skipping 10 matching lines @@
   // (-1, -1) will be used if the HistoryItem is an older version prior to
   // having visual viewport scroll offset.
   item.setVisualViewportScrollOffset(WebFloatPoint(-1, -1));
   item.setScrollOffset(WebPoint(120, 180));
   item.setPageScaleFactor(2);
 
   FrameTestHelpers::loadHistoryItem(webViewImpl()->mainFrame(), item,
                                     WebHistoryDifferentDocumentLoad,
                                     WebCachePolicy::UseProtocolCachePolicy);
 
-  VisualViewport& visualViewport =
-      frame()->page()->frameHost().visualViewport();
+  VisualViewport& visualViewport = frame()->page()->visualViewport();
   EXPECT_EQ(2, visualViewport.scale());
   EXPECT_SIZE_EQ(
       ScrollOffset(100, 150),
       frame()->view()->layoutViewportScrollableArea()->getScrollOffset());
   EXPECT_FLOAT_POINT_EQ(FloatPoint(20, 30),
                         visualViewport.visibleRect().location());
 }
 
 // Test that navigation to a new page with a different sized main frame doesn't
 // clobber the history item's main frame scroll offset. crbug.com/371867
 TEST_P(VisualViewportTest,
        TestNavigateToSmallerFrameViewHistoryItemClobberBug) {
   initializeWithAndroidSettings();
   webViewImpl()->resize(IntSize(400, 400));
   webViewImpl()->updateAllLifecyclePhases();
 
   registerMockedHttpURLLoad("content-width-1000.html");
   navigateTo(m_baseURL + "content-width-1000.html");
 
   FrameView* frameView = webViewImpl()->mainFrameImpl()->frameView();
   frameView->layoutViewportScrollableArea()->setScrollOffset(
       ScrollOffset(0, 1000), ProgrammaticScroll);
 
   EXPECT_SIZE_EQ(IntSize(1000, 1000), frameView->frameRect().size());
 
-  VisualViewport& visualViewport =
-      frame()->page()->frameHost().visualViewport();
+  VisualViewport& visualViewport = frame()->page()->visualViewport();
   visualViewport.setScale(2);
   visualViewport.setLocation(FloatPoint(350, 350));
 
   Persistent<HistoryItem> firstItem =
       webViewImpl()->mainFrameImpl()->frame()->loader().currentItem();
   EXPECT_SIZE_EQ(ScrollOffset(0, 1000), firstItem->getScrollOffset());
 
   // Now navigate to a page which causes a smaller frameView. Make sure that
   // navigating doesn't cause the history item to set a new scroll offset
   // before the item was replaced.
@@ skipping 28 matching lines @@
   mainFrame->executeScript(WebScriptSource("selectRange();"));
   EXPECT_EQ("ir", mainFrame->toWebLocalFrame()->selectionAsText().utf8());
 
   webViewImpl()->selectionBounds(baseRect, extentRect);
   WebPoint initialPoint(baseRect.x, baseRect.y);
   WebPoint endPoint(extentRect.x, extentRect.y);
 
   // Move the visual viewport over and make the selection in the same
   // screen-space location. The selection should change to two characters to the
   // right and down one line.
-  VisualViewport& visualViewport =
-      frame()->page()->frameHost().visualViewport();
+  VisualViewport& visualViewport = frame()->page()->visualViewport();
   visualViewport.move(ScrollOffset(60, 25));
   mainFrame->toWebLocalFrame()->moveRangeSelection(initialPoint, endPoint);
   EXPECT_EQ("t ", mainFrame->toWebLocalFrame()->selectionAsText().utf8());
 }
 
 // Test that the scrollFocusedEditableElementIntoRect method works with the
 // visual viewport.
 TEST_P(VisualViewportTest, DISABLED_TestScrollFocusedEditableElementIntoRect) {
   initializeWithDesktopSettings();
   webViewImpl()->resize(IntSize(500, 300));
 
   registerMockedHttpURLLoad("pinch-viewport-input-field.html");
   navigateTo(m_baseURL + "pinch-viewport-input-field.html");
 
-  VisualViewport& visualViewport =
-      frame()->page()->frameHost().visualViewport();
+  VisualViewport& visualViewport = frame()->page()->visualViewport();
   webViewImpl()->resizeVisualViewport(IntSize(200, 100));
   webViewImpl()->setInitialFocus(false);
   visualViewport.setLocation(FloatPoint());
   webViewImpl()->scrollFocusedEditableElementIntoRect(IntRect(0, 0, 500, 200));
 
   EXPECT_SIZE_EQ(
       ScrollOffset(0, frame()->view()->maximumScrollOffset().height()),
       frame()->view()->getScrollOffset());
   EXPECT_FLOAT_POINT_EQ(FloatPoint(150, 200),
                         visualViewport.visibleRect().location());
@@ skipping 99 matching lines @@
   webViewImpl()->mainFrameImpl()->setClient(&mockWebFrameClient);
   webViewImpl()->handleInputEvent(WebCoalescedInputEvent(mouseDownEvent));
   webViewImpl()->handleInputEvent(WebCoalescedInputEvent(mouseUpEvent));
 
   Mock::VerifyAndClearExpectations(&mockWebFrameClient);
   mouseDownEvent.button = WebMouseEvent::Button::Left;
   webViewImpl()->handleInputEvent(WebCoalescedInputEvent(mouseDownEvent));
 
   // Now pinch zoom into the page and move the visual viewport. The context menu
   // should still appear at the location of the event, relative to the WebView.
-  VisualViewport& visualViewport =
-      frame()->page()->frameHost().visualViewport();
+  VisualViewport& visualViewport = frame()->page()->visualViewport();
   webViewImpl()->setPageScaleFactor(2);
   EXPECT_CALL(mockWebFrameClient, didChangeScrollOffset(_));
   visualViewport.setLocation(FloatPoint(60, 80));
   EXPECT_CALL(mockWebFrameClient, showContextMenu(ContextMenuAtLocation(
                                       mouseDownEvent.x, mouseDownEvent.y)));
 
   mouseDownEvent.button = WebMouseEvent::Button::Right;
   webViewImpl()->handleInputEvent(WebCoalescedInputEvent(mouseDownEvent));
   webViewImpl()->handleInputEvent(WebCoalescedInputEvent(mouseUpEvent));
 
   // Reset the old client so destruction can occur naturally.
   webViewImpl()->mainFrameImpl()->setClient(oldClient);
 }
 
 // Test that the client is notified if page scroll events.
 TEST_P(VisualViewportTest, TestClientNotifiedOfScrollEvents) {
   initializeWithAndroidSettings();
   webViewImpl()->resize(IntSize(200, 300));
 
   registerMockedHttpURLLoad("200-by-300.html");
   navigateTo(m_baseURL + "200-by-300.html");
 
   WebFrameClient* oldClient = webViewImpl()->mainFrameImpl()->client();
   MockWebFrameClient mockWebFrameClient;
   webViewImpl()->mainFrameImpl()->setClient(&mockWebFrameClient);
 
   webViewImpl()->setPageScaleFactor(2);
-  VisualViewport& visualViewport =
-      frame()->page()->frameHost().visualViewport();
+  VisualViewport& visualViewport = frame()->page()->visualViewport();
 
   EXPECT_CALL(mockWebFrameClient, didChangeScrollOffset(_));
   visualViewport.setLocation(FloatPoint(60, 80));
   Mock::VerifyAndClearExpectations(&mockWebFrameClient);
 
   // Scroll vertically.
   EXPECT_CALL(mockWebFrameClient, didChangeScrollOffset(_));
   visualViewport.setLocation(FloatPoint(60, 90));
   Mock::VerifyAndClearExpectations(&mockWebFrameClient);
 
@@ skipping 11 matching lines @@
   initializeWithAndroidSettings();
 
   webViewImpl()->resize(IntSize(1000, 1000));
 
   registerMockedHttpURLLoad("scroll-into-view.html");
   navigateTo(m_baseURL + "scroll-into-view.html");
 
   FrameView& frameView = *webViewImpl()->mainFrameImpl()->frameView();
   ScrollableArea* layoutViewportScrollableArea =
       frameView.layoutViewportScrollableArea();
-  VisualViewport& visualViewport =
-      frame()->page()->frameHost().visualViewport();
+  VisualViewport& visualViewport = frame()->page()->visualViewport();
   Element* inputBox = frame()->document()->getElementById("box");
 
   webViewImpl()->setPageScaleFactor(2);
 
   // The element is already in the view so the scrollIntoView shouldn't move
   // the viewport at all.
   webViewImpl()->setVisualViewportOffset(WebFloatPoint(250.25f, 100.25f));
   layoutViewportScrollableArea->setScrollOffset(ScrollOffset(0, 900.75),
                                                 ProgrammaticScroll);
   inputBox->scrollIntoViewIfNeeded(false);
@@ skipping 54 matching lines @@
       frameView.contentsSize().height() - newHeight);
 }
 
 TEST_P(VisualViewportTest, TestBrowserControlsAdjustment) {
   initializeWithAndroidSettings();
   webViewImpl()->resizeWithBrowserControls(IntSize(500, 450), 20, false);
 
   registerMockedHttpURLLoad("content-width-1000.html");
   navigateTo(m_baseURL + "content-width-1000.html");
 
-  VisualViewport& visualViewport =
-      frame()->page()->frameHost().visualViewport();
+  VisualViewport& visualViewport = frame()->page()->visualViewport();
   FrameView& frameView = *webViewImpl()->mainFrameImpl()->frameView();
 
   visualViewport.setScale(1);
   EXPECT_SIZE_EQ(IntSize(500, 450), visualViewport.visibleRect().size());
   EXPECT_SIZE_EQ(IntSize(1000, 900), frameView.frameRect().size());
 
   // Simulate bringing down the browser controls by 20px.
   webViewImpl()->applyViewportDeltas(WebFloatSize(), WebFloatSize(),
                                      WebFloatSize(), 1, 1);
   EXPECT_SIZE_EQ(IntSize(500, 430), visualViewport.visibleRect().size());
@@ skipping 29 matching lines @@
                  frameView.layoutViewportScrollableArea()->getScrollOffset());
 }
 
 TEST_P(VisualViewportTest, TestBrowserControlsAdjustmentWithScale) {
   initializeWithAndroidSettings();
   webViewImpl()->resizeWithBrowserControls(IntSize(500, 450), 20, false);
 
   registerMockedHttpURLLoad("content-width-1000.html");
   navigateTo(m_baseURL + "content-width-1000.html");
 
-  VisualViewport& visualViewport =
-      frame()->page()->frameHost().visualViewport();
+  VisualViewport& visualViewport = frame()->page()->visualViewport();
   FrameView& frameView = *webViewImpl()->mainFrameImpl()->frameView();
 
   visualViewport.setScale(2);
   EXPECT_SIZE_EQ(IntSize(250, 225), visualViewport.visibleRect().size());
   EXPECT_SIZE_EQ(IntSize(1000, 900), frameView.frameRect().size());
 
   // Simulate bringing down the browser controls by 20px. Since we're zoomed in,
   // the browser controls take up half as much space (in document-space) than
   // they do at an unzoomed level.
   webViewImpl()->applyViewportDeltas(WebFloatSize(), WebFloatSize(),
@@ skipping 62 matching lines @@
   initializeWithAndroidSettings();
 
   // Initialize with browser controls showing and shrinking the Blink size.
   webViewImpl()->resizeWithBrowserControls(
       WebSize(500, visualViewportHeight - browserControlsHeight), 20, true);
   webViewImpl()->browserControls().setShownRatio(1);
 
   registerMockedHttpURLLoad("content-width-1000.html");
   navigateTo(m_baseURL + "content-width-1000.html");
 
-  VisualViewport& visualViewport =
-      frame()->page()->frameHost().visualViewport();
+  VisualViewport& visualViewport = frame()->page()->visualViewport();
   FrameView& frameView = *webViewImpl()->mainFrameImpl()->frameView();
 
   visualViewport.setScale(pageScale);
   EXPECT_SIZE_EQ(
       IntSize(250, (visualViewportHeight - browserControlsHeight) / pageScale),
       visualViewport.visibleRect().size());
   EXPECT_SIZE_EQ(IntSize(1000, layoutViewportHeight -
                                    browserControlsHeight / minPageScale),
                  frameView.frameRect().size());
   EXPECT_SIZE_EQ(IntSize(500, visualViewportHeight - browserControlsHeight),
@@ skipping 51 matching lines @@
   initializeWithAndroidSettings();
 
   // Initialize with browser controls hidden and not shrinking the Blink size.
   webViewImpl()->resizeWithBrowserControls(IntSize(500, visualViewportHeight),
                                            20, false);
   webViewImpl()->browserControls().setShownRatio(0);
 
   registerMockedHttpURLLoad("content-width-1000.html");
   navigateTo(m_baseURL + "content-width-1000.html");
 
-  VisualViewport& visualViewport =
-      frame()->page()->frameHost().visualViewport();
+  VisualViewport& visualViewport = frame()->page()->visualViewport();
   FrameView& frameView = *webViewImpl()->mainFrameImpl()->frameView();
 
   visualViewport.setScale(pageScale);
   EXPECT_SIZE_EQ(IntSize(250, visualViewportHeight / pageScale),
                  visualViewport.visibleRect().size());
   EXPECT_SIZE_EQ(IntSize(1000, layoutViewportHeight),
                  frameView.frameRect().size());
   EXPECT_SIZE_EQ(IntSize(500, visualViewportHeight), visualViewport.size());
 
   // Scroll all the way to the bottom, showing the the browser controls in the
@@ skipping 78 matching lines @@
 }
 
 // Tests that scrollbar layers are not attached to the inner viewport container
 // layer when hideScrollbars WebSetting is true.
 TEST_P(VisualViewportTest,
        TestScrollbarsNotAttachedWhenHideScrollbarsSettingIsTrue) {
   initializeWithAndroidSettings(configureHiddenScrollbarsSettings);
   webViewImpl()->resize(IntSize(100, 150));
   navigateTo("about:blank");
 
-  VisualViewport& visualViewport =
-      frame()->page()->frameHost().visualViewport();
+  VisualViewport& visualViewport = frame()->page()->visualViewport();
   EXPECT_FALSE(visualViewport.layerForHorizontalScrollbar()->parent());
   EXPECT_FALSE(visualViewport.layerForVerticalScrollbar()->parent());
 }
 
 // Tests that scrollbar layers are attached to the inner viewport container
 // layer when hideScrollbars WebSetting is false.
 TEST_P(VisualViewportTest,
        TestScrollbarsAttachedWhenHideScrollbarsSettingIsFalse) {
   initializeWithAndroidSettings();
   webViewImpl()->resize(IntSize(100, 150));
   navigateTo("about:blank");
 
-  VisualViewport& visualViewport =
-      frame()->page()->frameHost().visualViewport();
+  VisualViewport& visualViewport = frame()->page()->visualViewport();
   EXPECT_TRUE(visualViewport.layerForHorizontalScrollbar()->parent());
   EXPECT_TRUE(visualViewport.layerForVerticalScrollbar()->parent());
 }
 
 // Tests that the layout viewport's scroll layer bounds are updated in a
 // compositing change update. crbug.com/423188.
 TEST_P(VisualViewportTest, TestChangingContentSizeAffectsScrollBounds) {
   initializeWithAndroidSettings();
   webViewImpl()->resize(IntSize(100, 150));
 
@@ skipping 18 matching lines @@
 // viewport.
 TEST_P(VisualViewportTest, ResizeVisualViewportStaysWithinOuterViewport) {
   initializeWithDesktopSettings();
   webViewImpl()->resize(IntSize(100, 200));
 
   navigateTo("about:blank");
   webViewImpl()->updateAllLifecyclePhases();
 
   webViewImpl()->resizeVisualViewport(IntSize(100, 100));
 
-  VisualViewport& visualViewport =
-      frame()->page()->frameHost().visualViewport();
+  VisualViewport& visualViewport = frame()->page()->visualViewport();
   visualViewport.move(ScrollOffset(0, 100));
 
   EXPECT_EQ(100, visualViewport.getScrollOffset().height());
 
   webViewImpl()->resizeVisualViewport(IntSize(100, 200));
 
   EXPECT_EQ(0, visualViewport.getScrollOffset().height());
 }
 
 TEST_P(VisualViewportTest, ElementBoundsInViewportSpaceAccountsForViewport) {
   initializeWithAndroidSettings();
 
   webViewImpl()->resize(IntSize(500, 800));
 
   registerMockedHttpURLLoad("pinch-viewport-input-field.html");
   navigateTo(m_baseURL + "pinch-viewport-input-field.html");
 
   webViewImpl()->setInitialFocus(false);
   Element* inputElement = webViewImpl()->focusedElement();
 
   IntRect bounds = inputElement->layoutObject()->absoluteBoundingBoxRect();
 
-  VisualViewport& visualViewport =
-      frame()->page()->frameHost().visualViewport();
+  VisualViewport& visualViewport = frame()->page()->visualViewport();
   IntPoint scrollDelta(250, 400);
   visualViewport.setScale(2);
   visualViewport.setLocation(scrollDelta);
 
   const IntRect boundsInViewport = inputElement->boundsInViewport();
   IntRect expectedBounds = bounds;
   expectedBounds.scale(2.f);
   IntPoint expectedScrollDelta = scrollDelta;
   expectedScrollDelta.scale(2.f, 2.f);
 
@@ skipping 21 matching lines @@
 // methods work unchanged from the pre-virtual viewport mode.
 TEST_P(VisualViewportTest, bodyAndWindowScrollPropertiesAccountForViewport) {
   initializeWithAndroidSettings();
 
   webViewImpl()->resize(IntSize(200, 300));
 
   // Load page with no main frame scrolling.
   registerMockedHttpURLLoad("200-by-300-viewport.html");
   navigateTo(m_baseURL + "200-by-300-viewport.html");
 
-  VisualViewport& visualViewport =
-      frame()->page()->frameHost().visualViewport();
+  VisualViewport& visualViewport = frame()->page()->visualViewport();
   visualViewport.setScale(2);
 
   // Chrome's quirky behavior regarding viewport scrolling means we treat the
   // body element as the viewport and don't apply scrolling to the HTML element.
   RuntimeEnabledFeatures::setScrollTopLeftInteropEnabled(false);
 
   LocalDOMWindow* window = webViewImpl()->mainFrameImpl()->frame()->domWindow();
   window->scrollTo(100, 150);
   EXPECT_EQ(100, window->scrollX());
   EXPECT_EQ(150, window->scrollY());
@@ skipping 72 matching lines @@
   EXPECT_SIZE_EQ(IntSize(200, 400), frameView.frameRect().size());
   frameView.dispose();
 }
 
 // Tests that the maximum scroll offset of the viewport can be fractional.
 TEST_P(VisualViewportTest, FractionalMaxScrollOffset) {
   initializeWithDesktopSettings();
   webViewImpl()->resize(IntSize(101, 201));
   navigateTo("about:blank");
 
-  VisualViewport& visualViewport =
-      frame()->page()->frameHost().visualViewport();
+  VisualViewport& visualViewport = frame()->page()->visualViewport();
   ScrollableArea* scrollableArea = &visualViewport;
 
   webViewImpl()->setPageScaleFactor(1.0);
   EXPECT_SIZE_EQ(ScrollOffset(), scrollableArea->maximumScrollOffset());
 
   webViewImpl()->setPageScaleFactor(2);
   EXPECT_SIZE_EQ(ScrollOffset(101. / 2., 201. / 2.),
                  scrollableArea->maximumScrollOffset());
 }
 
 // Tests that the slow scrolling after an impl scroll on the visual viewport is
 // continuous. crbug.com/453460 was caused by the impl-path not updating the
 // ScrollAnimatorBase class.
 TEST_P(VisualViewportTest, SlowScrollAfterImplScroll) {
   initializeWithDesktopSettings();
   webViewImpl()->resize(IntSize(800, 600));
   navigateTo("about:blank");
 
-  VisualViewport& visualViewport =
-      frame()->page()->frameHost().visualViewport();
+  VisualViewport& visualViewport = frame()->page()->visualViewport();
 
   // Apply some scroll and scale from the impl-side.
   webViewImpl()->applyViewportDeltas(WebFloatSize(300, 200), WebFloatSize(0, 0),
                                      WebFloatSize(0, 0), 2, 0);
 
   EXPECT_SIZE_EQ(FloatSize(300, 200), visualViewport.getScrollOffset());
 
   // Send a scroll event on the main thread path.
   WebGestureEvent gsu(WebInputEvent::GestureScrollUpdate,
                       WebInputEvent::NoModifiers,
@@ skipping 46 matching lines @@
   EXPECT_EQ(std::string("Target4"), hitNode.name(nameFrom, nameObjects).utf8());
 }
 
 // Tests that the maximum scroll offset of the viewport can be fractional.
 TEST_P(VisualViewportTest, TestCoordinateTransforms) {
   initializeWithAndroidSettings();
   webViewImpl()->resize(IntSize(800, 600));
   registerMockedHttpURLLoad("content-width-1000.html");
   navigateTo(m_baseURL + "content-width-1000.html");
 
-  VisualViewport& visualViewport =
-      webViewImpl()->page()->frameHost().visualViewport();
+  VisualViewport& visualViewport = webViewImpl()->page()->visualViewport();
   FrameView& frameView = *webViewImpl()->mainFrameImpl()->frameView();
 
   // At scale = 1 the transform should be a no-op.
   visualViewport.setScale(1);
   EXPECT_FLOAT_POINT_EQ(
       FloatPoint(314, 273),
       visualViewport.viewportToRootFrame(FloatPoint(314, 273)));
   EXPECT_FLOAT_POINT_EQ(
       FloatPoint(314, 273),
       visualViewport.rootFrameToViewport(FloatPoint(314, 273)));
@@ skipping 72 matching lines @@
                               WebInputEvent::NoModifiers,
                               WebInputEvent::TimeStampForTesting);
   pinchUpdate.sourceDevice = WebGestureDeviceTouchpad;
   pinchUpdate.x = 100;
   pinchUpdate.y = 100;
   pinchUpdate.data.pinchUpdate.scale = 2;
   pinchUpdate.data.pinchUpdate.zoomDisabled = false;
 
   webViewImpl()->handleInputEvent(WebCoalescedInputEvent(pinchUpdate));
 
-  VisualViewport& visualViewport =
-      webViewImpl()->page()->frameHost().visualViewport();
+  VisualViewport& visualViewport = webViewImpl()->page()->visualViewport();
   FrameView& frameView = *webViewImpl()->mainFrameImpl()->frameView();
 
   EXPECT_FLOAT_SIZE_EQ(FloatSize(50, 50), visualViewport.getScrollOffset());
   EXPECT_SIZE_EQ(ScrollOffset(0, 0),
                  frameView.layoutViewportScrollableArea()->getScrollOffset());
 }
 
 TEST_P(VisualViewportTest, ResizeWithScrollAnchoring) {
   bool wasScrollAnchoringEnabled =
       RuntimeEnabledFeatures::scrollAnchoringEnabled();
@@ skipping 33 matching lines @@
   FrameView& frameView = *webViewImpl()->mainFrameImpl()->frameView();
 
   Element* scroller = frame()->document()->getElementById("rootScroller");
   NonThrowableExceptionState nonThrow;
   frame()->document()->setRootScroller(scroller, nonThrow);
 
   webViewImpl()->setPageScaleFactor(3.f);
   frameView.getScrollableArea()->setScrollOffset(ScrollOffset(0, 400),
                                                  ProgrammaticScroll);
 
-  VisualViewport& visualViewport =
-      webViewImpl()->page()->frameHost().visualViewport();
+  VisualViewport& visualViewport = webViewImpl()->page()->visualViewport();
   visualViewport.setScrollOffset(ScrollOffset(0, 400), ProgrammaticScroll);
 
   webViewImpl()->resize(IntSize(800, 500));
 
   EXPECT_SIZE_EQ(ScrollOffset(),
                  frameView.layoutViewportScrollableArea()->getScrollOffset());
 
   RuntimeEnabledFeatures::setSetRootScrollerEnabled(wasRootScrollerEnabled);
 }
 
@@ skipping 381 matching lines @@
                                    "  body {"
                                    "    margin: 0px;"
                                    "  }"
                                    "  div { height:110vh; width: 110vw; }"
                                    "</style>"
                                    "<div></div>",
                                    baseURL);
 }
 
 }  // namespace