Moved FrameHost::m_visualViewport to Page

third_party/WebKit/Source/web/tests/WebInputEventConversionTest.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:
  *
  *     * 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 661 matching lines @@
   WebViewImpl* webViewImpl =
       webViewHelper.initializeAndLoad(baseURL + fileName, true);
   int pageWidth = 640;
   int pageHeight = 480;
   webViewImpl->resize(WebSize(pageWidth, pageHeight));
   webViewImpl->updateAllLifecyclePhases();
 
   webViewImpl->setPageScaleFactor(2);
 
   IntPoint visualOffset(35, 60);
-  webViewImpl->page()->frameHost().visualViewport().setLocation(visualOffset);
+  webViewImpl->page()->visualViewport().setLocation(visualOffset);
 
   FrameView* view = toLocalFrame(webViewImpl->page()->mainFrame())->view();
 
   {
     WebMouseEvent webMouseEvent(WebInputEvent::MouseMove,
                                 WebInputEvent::NoModifiers,
                                 WebInputEvent::TimeStampForTesting);
     webMouseEvent.x = 10;
     webMouseEvent.y = 10;
     webMouseEvent.windowX = 10;
@@ skipping 120 matching lines @@
     EXPECT_EQ(webMouseEvent.globalX, transformedMouseEvent.globalX);
     EXPECT_EQ(webMouseEvent.globalY, transformedMouseEvent.globalY);
   }
 
   // Elastic overscroll and pinch-zoom (this doesn't actually ever happen,
   // but ensure that if it were to, the overscroll would be applied after the
   // pinch-zoom).
   float pageScale = 2;
   webViewImpl->setPageScaleFactor(pageScale);
   IntPoint visualOffset(35, 60);
-  webViewImpl->page()->frameHost().visualViewport().setLocation(visualOffset);
+  webViewImpl->page()->visualViewport().setLocation(visualOffset);
   {
     WebMouseEvent webMouseEvent(WebInputEvent::MouseMove,
                                 WebInputEvent::NoModifiers,
                                 WebInputEvent::TimeStampForTesting);
     webMouseEvent.x = 10;
     webMouseEvent.y = 10;
     webMouseEvent.windowX = 10;
     webMouseEvent.windowY = 10;
     webMouseEvent.globalX = 10;
     webMouseEvent.globalY = 10;
@@ skipping 52 matching lines @@
         flooredIntPoint(transformedMouseEvent.positionInRootFrame());
 
     EXPECT_EQ(webMouseEvent.x + elasticOverscroll.width(), position.x());
     EXPECT_EQ(webMouseEvent.y + elasticOverscroll.height(), position.y());
     EXPECT_EQ(webMouseEvent.globalX, transformedMouseEvent.globalX);
     EXPECT_EQ(webMouseEvent.globalY, transformedMouseEvent.globalY);
   }
 }
 
 }  // namespace blink