Use float for scroll offset.

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

 /*
  * Copyright (C) 2011, 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 1452 matching lines @@
 
   // Make the page scale and scroll with the given paremeters.
   webViewImpl->setPageScaleFactor(2.0f);
   webViewImpl->mainFrame()->setScrollOffset(WebSize(94, 111));
   EXPECT_EQ(2.0f, webViewImpl->pageScaleFactor());
   EXPECT_EQ(94, webViewImpl->mainFrame()->scrollOffset().width);
   EXPECT_EQ(111, webViewImpl->mainFrame()->scrollOffset().height);
   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();
   EXPECT_EQ(1.0f, webViewImpl->pageScaleFactor());
   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) {
   URLTestHelpers::registerMockedURLFromBaseURL(
       WebString::fromUTF8(m_baseURL.c_str()),
       WebString::fromUTF8("back_forward_restore_scroll.html"));
   WebViewImpl* webViewImpl = m_webViewHelper.initializeAndLoad(
       m_baseURL + "back_forward_restore_scroll.html");
   webViewImpl->resize(WebSize(640, 480));
   webViewImpl->updateAllLifecyclePhases();
@@ skipping 64 matching lines @@
 
   // Enter fullscreen.
   Element* element = static_cast<Element*>(
       webViewImpl->mainFrame()->document().getElementById("fullscreenElement"));
   webViewImpl->enterFullscreenForElement(element);
   webViewImpl->didEnterFullscreen();
   webViewImpl->updateAllLifecyclePhases();
 
   // 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
   // while in fullscreen so if we try to restore before the style and layout
   // is applied the offsets will be clamped.
   webViewImpl->didExitFullscreen();
   EXPECT_TRUE(webViewImpl->mainFrameImpl()->frameView()->needsLayout());
   webViewImpl->updateAllLifecyclePhases();
 
   EXPECT_EQ(2000, webViewImpl->mainFrame()->scrollOffset().height);
@@ skipping 16 matching lines @@
 
   // Enter fullscreen.
   Element* element = static_cast<Element*>(
       webViewImpl->mainFrame()->document().getElementById("fullscreenElement"));
   webViewImpl->enterFullscreenForElement(element);
   webViewImpl->didEnterFullscreen();
   webViewImpl->updateAllLifecyclePhases();
 
   // 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
   // enter fullscreen.
   webViewImpl->exitFullscreenForElement(element);
   webViewImpl->didExitFullscreen();
   webViewImpl->enterFullscreenForElement(element);
   webViewImpl->didEnterFullscreen();
   webViewImpl->updateAllLifecyclePhases();
 
   // 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);
   webViewImpl->didExitFullscreen();
   webViewImpl->updateAllLifecyclePhases();
 
   EXPECT_EQ(2000, webViewImpl->mainFrame()->scrollOffset().height);
 }
 
 TEST_F(WebViewTest, EnterFullscreenResetScrollAndScaleState) {
@@ skipping 2385 matching lines @@
   FrameView* frameView = webViewImpl->mainFrameImpl()->frame()->view();
   DevToolsEmulator* devToolsEmulator = webViewImpl->devToolsEmulator();
 
   TransformationMatrix expectedMatrix;
   expectedMatrix.makeIdentity();
   EXPECT_EQ(expectedMatrix, webViewImpl->getRootLayerTransformForTesting());
 
   // 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)
       .translate(-50, -55)
       .translate(100, 150)
       .scale(1. / 1.5f);
   EXPECT_EQ(expectedMatrix, webViewImpl->getRootLayerTransformForTesting());
   // Page scroll and scale are irrelevant for visibleContentRect.
   EXPECT_EQ(IntRect(50, 55, 50, 75),
             *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)
       .translate(50, 55)
       .scale(1. / 1.5f);
   EXPECT_EQ(expectedMatrix, webViewImpl->getRootLayerTransformForTesting());
   // visibleContentRect doesn't change.
   EXPECT_EQ(IntRect(50, 55, 50, 75),
             *devToolsEmulator->visibleContentRectForPainting());
 
   // Transform adapts to page scale changes.
   webViewImpl->setPageScaleFactor(2.f);
   expectedMatrix.makeIdentity()
       .scale(2.f)
       .translate(-50, -55)
       .translate(50, 55)
       .scale(1. / 2.f);
   EXPECT_EQ(expectedMatrix, webViewImpl->getRootLayerTransformForTesting());
   // visibleContentRect doesn't change.
   EXPECT_EQ(IntRect(50, 55, 50, 75),
             *devToolsEmulator->visibleContentRectForPainting());
 }
 
 }  // namespace blink