Use float for scroll offset.

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

Index: third_party/WebKit/Source/web/tests/WebViewTest.cpp
diff --git a/third_party/WebKit/Source/web/tests/WebViewTest.cpp b/third_party/WebKit/Source/web/tests/WebViewTest.cpp
index 5bd846c6162f86fd4d5b94533d78a0034c62aa55..5010137e1fc4b7302867af454b2f4982d30e89fe 100644
--- a/third_party/WebKit/Source/web/tests/WebViewTest.cpp
+++ b/third_party/WebKit/Source/web/tests/WebViewTest.cpp
@@ -1470,8 +1470,9 @@ TEST_F(WebViewTest, HistoryResetScrollAndScaleState) {
   LocalFrame* mainFrameLocal = toLocalFrame(webViewImpl->page()->mainFrame());
   mainFrameLocal->loader().saveScrollState();
   EXPECT_EQ(2.0f, mainFrameLocal->loader().currentItem()->pageScaleFactor());
-  EXPECT_EQ(94, mainFrameLocal->loader().currentItem()->scrollPoint().x());
-  EXPECT_EQ(111, mainFrameLocal->loader().currentItem()->scrollPoint().y());
+  EXPECT_EQ(94, mainFrameLocal->loader().currentItem()->scrollOffset().width());
+  EXPECT_EQ(111,
+            mainFrameLocal->loader().currentItem()->scrollOffset().height());
 
   // Confirm that resetting the page state resets the saved scroll position.
   webViewImpl->resetScrollAndScaleState();
@@ -1479,8 +1480,8 @@ TEST_F(WebViewTest, HistoryResetScrollAndScaleState) {
   EXPECT_EQ(0, webViewImpl->mainFrame()->scrollOffset().width);
   EXPECT_EQ(0, webViewImpl->mainFrame()->scrollOffset().height);
   EXPECT_EQ(1.0f, mainFrameLocal->loader().currentItem()->pageScaleFactor());
-  EXPECT_EQ(0, mainFrameLocal->loader().currentItem()->scrollPoint().x());
-  EXPECT_EQ(0, mainFrameLocal->loader().currentItem()->scrollPoint().y());
+  EXPECT_EQ(0, mainFrameLocal->loader().currentItem()->scrollOffset().width());
+  EXPECT_EQ(0, mainFrameLocal->loader().currentItem()->scrollOffset().height());
 }
 
 TEST_F(WebViewTest, BackForwardRestoreScroll) {
@@ -1565,9 +1566,10 @@ TEST_F(WebViewTest, FullscreenResetScrollAndScaleFullscreenStyles) {
 
   // Sanity-check. There should be no scrolling possible.
   ASSERT_EQ(0, webViewImpl->mainFrame()->scrollOffset().height);
-  ASSERT_EQ(
-      0,
-      webViewImpl->mainFrameImpl()->frameView()->maximumScrollPosition().y());
+  ASSERT_EQ(0, webViewImpl->mainFrameImpl()
+                   ->frameView()
+                   ->maximumScrollOffset()
+                   .height());
 
   // Confirm that after exiting and doing a layout, the scroll and scale
   // parameters are reset. The page sets display: none on overflowing elements
@@ -1604,9 +1606,10 @@ TEST_F(WebViewTest, FullscreenResetScrollAndScaleExitAndReenter) {
 
   // Sanity-check. There should be no scrolling possible.
   ASSERT_EQ(0, webViewImpl->mainFrame()->scrollOffset().height);
-  ASSERT_EQ(
-      0,
-      webViewImpl->mainFrameImpl()->frameView()->maximumScrollPosition().y());
+  ASSERT_EQ(0, webViewImpl->mainFrameImpl()
+                   ->frameView()
+                   ->maximumScrollOffset()
+                   .height());
 
   // Exit and, without performing a layout, reenter fullscreen again. We
   // shouldn't try to restore the scroll and scale values when we layout to
@@ -1619,9 +1622,10 @@ TEST_F(WebViewTest, FullscreenResetScrollAndScaleExitAndReenter) {
 
   // Sanity-check. There should be no scrolling possible.
   ASSERT_EQ(0, webViewImpl->mainFrame()->scrollOffset().height);
-  ASSERT_EQ(
-      0,
-      webViewImpl->mainFrameImpl()->frameView()->maximumScrollPosition().y());
+  ASSERT_EQ(0, webViewImpl->mainFrameImpl()
+                   ->frameView()
+                   ->maximumScrollOffset()
+                   .height());
 
   // When we exit now, we should restore the original scroll value.
   webViewImpl->exitFullscreenForElement(element);
@@ -4027,8 +4031,8 @@ TEST_F(WebViewTest, ViewportOverrideAdaptsToScaleAndScroll) {
   // Initial transform takes current page scale and scroll position into
   // account.
   webViewImpl->setPageScaleFactor(1.5f);
-  frameView->setScrollPosition(DoublePoint(100, 150), ProgrammaticScroll,
-                               ScrollBehaviorInstant);
+  frameView->setScrollOffset(ScrollOffset(100, 150), ProgrammaticScroll,
+                             ScrollBehaviorInstant);
   devToolsEmulator->forceViewport(WebFloatPoint(50, 55), 2.f);
   expectedMatrix.makeIdentity()
       .scale(2.f)
@@ -4041,8 +4045,8 @@ TEST_F(WebViewTest, ViewportOverrideAdaptsToScaleAndScroll) {
             *devToolsEmulator->visibleContentRectForPainting());
 
   // Transform adapts to scroll changes.
-  frameView->setScrollPosition(DoublePoint(50, 55), ProgrammaticScroll,
-                               ScrollBehaviorInstant);
+  frameView->setScrollOffset(ScrollOffset(50, 55), ProgrammaticScroll,
+                             ScrollBehaviorInstant);
   expectedMatrix.makeIdentity()
       .scale(2.f)
       .translate(-50, -55)