Moved FrameHost::m_visualViewport to Page

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

 /*
  * Copyright (C) 2010 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 1149 matching lines @@
     EXPECT_TRUE(
         setTextAutosizingMultiplier(toLocalFrame(frame)->document(), 2));
     for (LayoutItem layoutItem =
              toLocalFrame(frame)->document()->layoutViewItem();
          !layoutItem.isNull(); layoutItem = layoutItem.nextInPreOrder()) {
       if (layoutItem.isText())
         EXPECT_FALSE(layoutItem.needsLayout());
     }
   }
 
-  frameView->page()->frameHost().visualViewport().setSize(IntSize(200, 200));
+  frameView->page()->visualViewport().setSize(IntSize(200, 200));
 
   for (Frame* frame = mainFrame; frame; frame = frame->tree().traverseNext()) {
     if (!frame->isLocalFrame())
       continue;
     for (LayoutItem layoutItem =
              toLocalFrame(frame)->document()->layoutViewItem();
          !layoutItem.isNull(); layoutItem = layoutItem.nextInPreOrder()) {
       if (layoutItem.isText())
         EXPECT_TRUE(layoutItem.needsLayout());
     }
@@ skipping 623 matching lines @@
                                .width());
   EXPECT_EQ(0, webViewHelper.webView()
                    ->mainFrameImpl()
                    ->frameView()
                    ->layoutSize()
                    .height());
   EXPECT_EQ(viewportWidth, scrollContainer->size().width());
   EXPECT_EQ(viewportHeight, scrollContainer->size().height());
 
   LocalFrame* frame = webViewHelper.webView()->mainFrameImpl()->frame();
-  VisualViewport& visualViewport = frame->page()->frameHost().visualViewport();
+  VisualViewport& visualViewport = frame->page()->visualViewport();
   EXPECT_EQ(viewportHeight, visualViewport.containerLayer()->size().height());
   EXPECT_TRUE(
       visualViewport.containerLayer()->platformLayer()->masksToBounds());
   EXPECT_FALSE(scrollContainer->platformLayer()->masksToBounds());
 }
 
 TEST_P(ParameterizedWebFrameTest, SetForceZeroLayoutHeight) {
   registerMockedHttpURLLoad("200-by-300.html");
 
   FixedLayoutTestWebViewClient client;
@@ skipping 4214 matching lines @@
 
   webViewHelper.resize(WebSize(100, 200));
 
   // Scroll main frame to the bottom of the document
   webViewImpl->mainFrame()->setScrollOffset(WebSize(0, 400));
   EXPECT_SIZE_EQ(ScrollOffset(0, 400), frame->view()->getScrollOffset());
 
   webViewImpl->setPageScaleFactor(2.0);
 
   // Scroll visual viewport to the top of the main frame.
-  VisualViewport& visualViewport = frame->page()->frameHost().visualViewport();
+  VisualViewport& visualViewport = frame->page()->visualViewport();
   visualViewport.setLocation(FloatPoint(0, 0));
   EXPECT_SIZE_EQ(ScrollOffset(0, 0), visualViewport.getScrollOffset());
 
   // Tap at the top: there is nothing there.
   client.resetTriggered();
   webViewHelper.webView()->handleInputEvent(fatTap(10, 60));
   EXPECT_FALSE(client.triggered());
 
   // Scroll visual viewport to the bottom of the main frame.
   visualViewport.setLocation(FloatPoint(0, 200));
@@ skipping 1661 matching lines @@
   EXPECT_EQ(divFullscreen, Fullscreen::currentFullScreenElementFrom(*document));
   EXPECT_EQ(divFullscreen, Fullscreen::fullscreenElementFrom(*document));
   webViewImpl->updateAllLifecyclePhases();
   EXPECT_EQ(divFullscreen, Fullscreen::currentFullScreenElementFrom(*document));
   EXPECT_EQ(divFullscreen, Fullscreen::fullscreenElementFrom(*document));
 
   // Verify that the viewports are nonscrollable.
   FrameView* frameView = webViewHelper.webView()->mainFrameImpl()->frameView();
   WebLayer* layoutViewportScrollLayer =
       webViewImpl->compositor()->scrollLayer()->platformLayer();
-  WebLayer* visualViewportScrollLayer = frameView->page()
-                                            ->frameHost()
-                                            .visualViewport()
-                                            .scrollLayer()
-                                            ->platformLayer();
+  WebLayer* visualViewportScrollLayer =
+      frameView->page()->visualViewport().scrollLayer()->platformLayer();
   ASSERT_FALSE(layoutViewportScrollLayer->userScrollableHorizontal());
   ASSERT_FALSE(layoutViewportScrollLayer->userScrollableVertical());
   ASSERT_FALSE(visualViewportScrollLayer->userScrollableHorizontal());
   ASSERT_FALSE(visualViewportScrollLayer->userScrollableVertical());
 
   // Verify that the viewports are scrollable upon exiting fullscreen.
   EXPECT_EQ(divFullscreen, Fullscreen::currentFullScreenElementFrom(*document));
   EXPECT_EQ(divFullscreen, Fullscreen::fullscreenElementFrom(*document));
   webViewImpl->didExitFullscreen();
   EXPECT_EQ(nullptr, Fullscreen::currentFullScreenElementFrom(*document));
@@ skipping 784 matching lines @@
 
   remoteFrame->view()->resize(size);
 
   FrameTestHelpers::TestWebFrameClient client;
   WebLocalFrame* localFrame = WebLocalFrame::createProvisional(
       &client, nullptr, nullptr, remoteFrame, WebSandboxFlags::None);
   remoteFrame->swap(localFrame);
 
   // Verify that the size that was set with a remote main frame is correct
   // after swapping to a local frame.
-  FrameHost* host =
-      toWebViewImpl(localFrame->view())->page()->mainFrame()->host();
-  EXPECT_EQ(size.width, host->visualViewport().size().width());
-  EXPECT_EQ(size.height, host->visualViewport().size().height());
+  Page* page = toWebViewImpl(localFrame->view())->page()->mainFrame()->page();
+  EXPECT_EQ(size.width, page->visualViewport().size().width());
+  EXPECT_EQ(size.height, page->visualViewport().size().height());
 
   // Manually reset to break WebViewHelper's dependency on the stack allocated
   // TestWebFrameClient.
   reset();
   remoteFrame->close();
 }
 
 namespace {
 
 class SwapMainFrameWhenTitleChangesWebFrameClient
@@ skipping 2892 matching lines @@
                       "document.querySelector('input').focus();"));
 
   // Verify that the right WebWidgetClient has been notified.
   EXPECT_TRUE(webWidgetClient.didShowVirtualKeyboard());
 
   remoteFrame->close();
   webViewHelper.reset();
 }
 
 }  // namespace blink