Remove WebViewImpl helper methods for setting scroll offset.

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 2142 matching lines @@
             webViewHelper.webViewImpl()->resize(WebSize(viewportSize.height, viewportSize.width));
             float expectedPageScaleFactor = initialPageScaleFactor * (shouldScaleRelativeToViewportWidth ? 1 / aspectRatio : 1);
             EXPECT_NEAR(expectedPageScaleFactor, webViewHelper.webViewImpl()->pageScaleFactor(), 0.05f);
             EXPECT_EQ(WebSize(), webViewHelper.webViewImpl()->mainFrame()->scrollOffset());
         }
 
         // Resizing just the height should not affect pageScaleFactor or scrollOffset.
         {
             webViewHelper.webViewImpl()->resize(WebSize(viewportSize.width, viewportSize.height));
             webViewHelper.webViewImpl()->setPageScaleFactor(initialPageScaleFactor);
-            webViewHelper.webViewImpl()->setMainFrameScrollOffset(WebPoint(scrollOffset.width, scrollOffset.height));
+            webViewHelper.webViewImpl()->mainFrame()->setScrollOffset(scrollOffset);
             webViewHelper.webViewImpl()->layout();
             const WebSize expectedScrollOffset = webViewHelper.webViewImpl()->mainFrame()->scrollOffset();
             webViewHelper.webViewImpl()->resize(WebSize(viewportSize.width, viewportSize.height * 0.8f));
             EXPECT_EQ(initialPageScaleFactor, webViewHelper.webViewImpl()->pageScaleFactor());
             EXPECT_EQ(expectedScrollOffset, webViewHelper.webViewImpl()->mainFrame()->scrollOffset());
             webViewHelper.webViewImpl()->resize(WebSize(viewportSize.width, viewportSize.height * 0.8f));
             EXPECT_EQ(initialPageScaleFactor, webViewHelper.webViewImpl()->pageScaleFactor());
             EXPECT_EQ(expectedScrollOffset, webViewHelper.webViewImpl()->mainFrame()->scrollOffset());
         }
     }
@@ skipping 139 matching lines @@
 
     webViewHelper.webView()->resize(WebSize(viewWidth * 10, viewHeight * 10));
     webViewHelper.webView()->layout();
     EXPECT_FALSE(view->layoutView()->compositor()->layerForHorizontalScrollbar());
     EXPECT_FALSE(view->layoutView()->compositor()->layerForVerticalScrollbar());
 }
 
 void setScaleAndScrollAndLayout(WebViewImpl* webView, WebPoint scroll, float scale)
 {
     webView->setPageScaleFactor(scale);
-    webView->setMainFrameScrollOffset(WebPoint(scroll.x, scroll.y));
+    webView->mainFrame()->setScrollOffset(WebSize(scroll.x, scroll.y));
     webView->layout();
 }
 
 void simulatePageScale(WebViewImpl* webViewImpl, float& scale)
 {
     IntSize scrollDelta = webViewImpl->fakePageScaleAnimationTargetPositionForTesting() - webViewImpl->mainFrameImpl()->frameView()->scrollPosition();
     float scaleDelta = webViewImpl->fakePageScaleAnimationPageScaleForTesting() / webViewImpl->pageScaleFactor();
     webViewImpl->applyViewportDeltas(WebFloatSize(), FloatSize(scrollDelta), WebFloatSize(), scaleDelta, 0);
     scale = webViewImpl->pageScaleFactor();
 }
@@ skipping 2343 matching lines @@
     webViewHelper.initializeAndLoad(m_baseURL + htmlFile, true, 0, &client, configureAndroid);
 
     WebViewImpl* webViewImpl = webViewHelper.webViewImpl();
     ASSERT_TRUE(webViewImpl);
     LocalFrame* frame = webViewImpl->mainFrameImpl()->frame();
     ASSERT_TRUE(frame);
 
     webViewHelper.webView()->resize(WebSize(100, 200));
 
     // Scroll main frame to the bottom of the document
-    webViewImpl->setMainFrameScrollOffset(WebPoint(0, 400));
+    webViewImpl->mainFrame()->setScrollOffset(WebSize(0, 400));
     EXPECT_POINT_EQ(IntPoint(0, 400), frame->view()->scrollPosition());
 
     webViewImpl->setPageScaleFactor(2.0);
 
     // Scroll pinch viewport to the top of the main frame.
     PinchViewport& pinchViewport = frame->page()->frameHost().pinchViewport();
     pinchViewport.setLocation(FloatPoint(0, 0));
     EXPECT_FLOAT_POINT_EQ(FloatPoint(0, 0), pinchViewport.location());
 
     // Tap at the top: there is nothing there.
@@ skipping 1412 matching lines @@
 
     WebViewImpl* webView = webViewHelper.webViewImpl();
     FrameView* frameView = webViewHelper.webViewImpl()->mainFrameImpl()->frameView();
 
     float topControlsHeight = 40;
     webView->setTopControlsHeight(topControlsHeight, false);
     webView->resize(WebSize(100, 100));
     webView->setPageScaleFactor(2.0f);
     webView->layout();
 
-    webView->setMainFrameScrollOffset(WebPoint(0, 2000));
+    webView->mainFrame()->setScrollOffset(WebSize(0, 2000));
     EXPECT_POINT_EQ(IntPoint(0, 1900), IntPoint(frameView->scrollOffset()));
 
     // Simulate the top controls showing by 20px, thus shrinking the viewport
     // and allowing it to scroll an additional 20px.
     webView->applyViewportDeltas(WebFloatSize(), WebFloatSize(), WebFloatSize(), 1.0f, 20.0f / topControlsHeight);
     EXPECT_POINT_EQ(IntPoint(0, 1920), frameView->maximumScrollPosition());
 
     // Show more, make sure the scroll actually gets clamped.
     webView->applyViewportDeltas(WebFloatSize(), WebFloatSize(), WebFloatSize(), 1.0f, 20.0f / topControlsHeight);
-    webView->setMainFrameScrollOffset(WebPoint(0, 2000));
+    webView->mainFrame()->setScrollOffset(WebSize(0, 2000));
     EXPECT_POINT_EQ(IntPoint(0, 1940), IntPoint(frameView->scrollOffset()));
 
     // Hide until there's 10px showing.
     webView->applyViewportDeltas(WebFloatSize(), WebFloatSize(), WebFloatSize(), 1.0f, -30.0f / topControlsHeight);
     EXPECT_POINT_EQ(IntPoint(0, 1910), frameView->maximumScrollPosition());
 
     // Simulate a LayoutPart::resize. The frame is resized to accomodate
     // the top controls and Blink's view of the top controls matches that of
     // the CC
     webView->applyViewportDeltas(WebFloatSize(), WebFloatSize(), WebFloatSize(), 1.0f, 30.0f / topControlsHeight);
@@ skipping 1264 matching lines @@
 
     EXPECT_EQ(parent, firstFrame->parent());
     EXPECT_EQ(parent, secondFrame->parent());
     EXPECT_EQ(parent, thirdFrame->parent());
     EXPECT_EQ(parent, fourthFrame->parent());
 
     view->close();
 }
 
 } // namespace blink