Use float for scroll offset.

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 149 matching lines @@
 const int touchPointPadding = 32;
 
 #define EXPECT_RECT_EQ(expected, actual)           \
   do {                                             \
     EXPECT_EQ(expected.x(), actual.x());           \
     EXPECT_EQ(expected.y(), actual.y());           \
     EXPECT_EQ(expected.width(), actual.width());   \
     EXPECT_EQ(expected.height(), actual.height()); \
   } while (false)
 
-#define EXPECT_POINT_EQ(expected, actual) \
-  do {                                    \
-    EXPECT_EQ(expected.x(), actual.x());  \
-    EXPECT_EQ(expected.y(), actual.y());  \
+#define EXPECT_SIZE_EQ(expected, actual)           \
+  do {                                             \
+    EXPECT_EQ(expected.width(), actual.width());   \
+    EXPECT_EQ(expected.height(), actual.height()); \
   } while (false)
 
 #define EXPECT_FLOAT_POINT_EQ(expected, actual) \
   do {                                          \
     EXPECT_FLOAT_EQ(expected.x(), actual.x());  \
     EXPECT_FLOAT_EQ(expected.y(), actual.y());  \
   } while (false)
 
 class WebFrameTest : public ::testing::Test {
  protected:
@@ skipping 2735 matching lines @@
 
 void setScaleAndScrollAndLayout(WebViewImpl* webView,
                                 WebPoint scroll,
                                 float scale) {
   webView->setPageScaleFactor(scale);
   webView->mainFrame()->setScrollOffset(WebSize(scroll.x, scroll.y));
   webView->updateAllLifecyclePhases();
 }
 
 void simulatePageScale(WebViewImpl* webViewImpl, float& scale) {
-  IntSize scrollDelta =
-      webViewImpl->fakePageScaleAnimationTargetPositionForTesting() -
-      webViewImpl->mainFrameImpl()->frameView()->scrollPosition();
+  ScrollOffset scrollDelta =
+      toScrollOffset(
+          webViewImpl->fakePageScaleAnimationTargetPositionForTesting()) -
+      webViewImpl->mainFrameImpl()->frameView()->scrollOffset();
   float scaleDelta = webViewImpl->fakePageScaleAnimationPageScaleForTesting() /
                      webViewImpl->pageScaleFactor();
   webViewImpl->applyViewportDeltas(WebFloatSize(), FloatSize(scrollDelta),
                                    WebFloatSize(), scaleDelta, 0);
   scale = webViewImpl->pageScaleFactor();
 }
 
 void simulateMultiTargetZoom(WebViewImpl* webViewImpl,
                              const WebRect& rect,
                              float& scale) {
@@ skipping 2756 matching lines @@
 
   WebViewImpl* webViewImpl = webViewHelper.webView();
   ASSERT_TRUE(webViewImpl);
   LocalFrame* frame = webViewImpl->mainFrameImpl()->frame();
   ASSERT_TRUE(frame);
 
   webViewHelper.resize(WebSize(100, 200));
 
   // Scroll main frame to the bottom of the document
   webViewImpl->mainFrame()->setScrollOffset(WebSize(0, 400));
-  EXPECT_POINT_EQ(IntPoint(0, 400), frame->view()->scrollPosition());
+  EXPECT_SIZE_EQ(ScrollOffset(0, 400), frame->view()->scrollOffset());
 
   webViewImpl->setPageScaleFactor(2.0);
 
   // Scroll visual viewport to the top of the main frame.
   VisualViewport& visualViewport = frame->page()->frameHost().visualViewport();
   visualViewport.setLocation(FloatPoint(0, 0));
   EXPECT_FLOAT_POINT_EQ(FloatPoint(0, 0), visualViewport.location());
 
   // Tap at the top: there is nothing there.
   client.resetTriggered();
@@ skipping 730 matching lines @@
 
   WebLocalFrameImpl* frameImpl = webViewHelper.webView()->mainFrameImpl();
   DocumentLoader::InitialScrollState& initialScrollState =
       frameImpl->frame()->loader().documentLoader()->initialScrollState();
   GraphicsLayer* frameViewLayer = frameImpl->frameView()->layerForScrolling();
 
   EXPECT_FALSE(client.wasFrameScrolled());
   EXPECT_FALSE(initialScrollState.wasScrolledByUser);
 
   // Do a compositor scroll, verify that this is counted as a user scroll.
-  frameViewLayer->platformLayer()->setScrollPositionDouble(
-      WebDoublePoint(0, 1));
+  frameViewLayer->platformLayer()->setScrollOffset(WebFloatSize(0, 1));
   frameViewLayer->didScroll();
   webViewHelper.webView()->applyViewportDeltas(WebFloatSize(), WebFloatSize(),
                                                WebFloatSize(), 1.7f, 0);
   EXPECT_TRUE(client.wasFrameScrolled());
   EXPECT_TRUE(initialScrollState.wasScrolledByUser);
 
   client.reset();
   initialScrollState.wasScrolledByUser = false;
 
   // The page scale 1.0f and scroll.
-  frameViewLayer->platformLayer()->setScrollPositionDouble(
-      WebDoublePoint(0, 2));
+  frameViewLayer->platformLayer()->setScrollOffset(WebFloatSize(0, 2));
   frameViewLayer->didScroll();
   webViewHelper.webView()->applyViewportDeltas(WebFloatSize(), WebFloatSize(),
                                                WebFloatSize(), 1.0f, 0);
   EXPECT_TRUE(client.wasFrameScrolled());
   EXPECT_TRUE(initialScrollState.wasScrolledByUser);
   client.reset();
   initialScrollState.wasScrolledByUser = false;
 
   // No scroll event if there is no scroll delta.
   frameViewLayer->didScroll();
   webViewHelper.webView()->applyViewportDeltas(WebFloatSize(), WebFloatSize(),
                                                WebFloatSize(), 1.0f, 0);
   EXPECT_FALSE(client.wasFrameScrolled());
   EXPECT_FALSE(initialScrollState.wasScrolledByUser);
   client.reset();
 
   // Non zero page scale and scroll.
-  frameViewLayer->platformLayer()->setScrollPositionDouble(
-      WebDoublePoint(9, 15));
+  frameViewLayer->platformLayer()->setScrollOffset(WebFloatSize(9, 15));
   frameViewLayer->didScroll();
   webViewHelper.webView()->applyViewportDeltas(WebFloatSize(), WebFloatSize(),
                                                WebFloatSize(), 0.6f, 0);
   EXPECT_TRUE(client.wasFrameScrolled());
   EXPECT_TRUE(initialScrollState.wasScrolledByUser);
   client.reset();
   initialScrollState.wasScrolledByUser = false;
 
   // Programmatic scroll.
   frameImpl->executeScript(WebScriptSource("window.scrollTo(0, 20);"));
@@ skipping 737 matching lines @@
 
   WebViewImpl* webView = webViewHelper.webView();
   FrameView* frameView = webViewHelper.webView()->mainFrameImpl()->frameView();
 
   float topControlsHeight = 40;
   webView->resizeWithTopControls(WebSize(100, 100), topControlsHeight, false);
   webView->setPageScaleFactor(2.0f);
   webView->updateAllLifecyclePhases();
 
   webView->mainFrame()->setScrollOffset(WebSize(0, 2000));
-  EXPECT_POINT_EQ(IntPoint(0, 1900), IntPoint(frameView->scrollOffset()));
+  EXPECT_SIZE_EQ(ScrollOffset(0, 1900), 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());
+  EXPECT_SIZE_EQ(ScrollOffset(0, 1920), frameView->maximumScrollOffset());
 
   // Show more, make sure the scroll actually gets clamped.
   webView->applyViewportDeltas(WebFloatSize(), WebFloatSize(), WebFloatSize(),
                                1.0f, 20.0f / topControlsHeight);
   webView->mainFrame()->setScrollOffset(WebSize(0, 2000));
-  EXPECT_POINT_EQ(IntPoint(0, 1940), IntPoint(frameView->scrollOffset()));
+  EXPECT_SIZE_EQ(ScrollOffset(0, 1940), 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());
+  EXPECT_SIZE_EQ(ScrollOffset(0, 1910), frameView->maximumScrollOffset());
 
   // 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);
   webView->resizeWithTopControls(WebSize(100, 60), 40.0f, true);
   webView->updateAllLifecyclePhases();
-  EXPECT_POINT_EQ(IntPoint(0, 1940), frameView->maximumScrollPosition());
+  EXPECT_SIZE_EQ(ScrollOffset(0, 1940), frameView->maximumScrollOffset());
 
   // Now simulate hiding.
   webView->applyViewportDeltas(WebFloatSize(), WebFloatSize(), WebFloatSize(),
                                1.0f, -10.0f / topControlsHeight);
-  EXPECT_POINT_EQ(IntPoint(0, 1930), frameView->maximumScrollPosition());
+  EXPECT_SIZE_EQ(ScrollOffset(0, 1930), frameView->maximumScrollOffset());
 
   // Reset to original state: 100px widget height, top controls fully hidden.
   webView->applyViewportDeltas(WebFloatSize(), WebFloatSize(), WebFloatSize(),
                                1.0f, -30.0f / topControlsHeight);
   webView->resizeWithTopControls(WebSize(100, 100), topControlsHeight, false);
   webView->updateAllLifecyclePhases();
-  EXPECT_POINT_EQ(IntPoint(0, 1900), frameView->maximumScrollPosition());
+  EXPECT_SIZE_EQ(ScrollOffset(0, 1900), frameView->maximumScrollOffset());
 
   // Show the top controls by just 1px, since we're zoomed in to 2X, that
   // should allow an extra 0.5px of scrolling in the visual viewport. Make
   // sure we're not losing any pixels when applying the adjustment on the
   // main frame.
   webView->applyViewportDeltas(WebFloatSize(), WebFloatSize(), WebFloatSize(),
                                1.0f, 1.0f / topControlsHeight);
-  EXPECT_POINT_EQ(IntPoint(0, 1901), frameView->maximumScrollPosition());
+  EXPECT_SIZE_EQ(ScrollOffset(0, 1901), frameView->maximumScrollOffset());
 
   webView->applyViewportDeltas(WebFloatSize(), WebFloatSize(), WebFloatSize(),
                                1.0f, 2.0f / topControlsHeight);
-  EXPECT_POINT_EQ(IntPoint(0, 1903), frameView->maximumScrollPosition());
+  EXPECT_SIZE_EQ(ScrollOffset(0, 1903), frameView->maximumScrollOffset());
 }
 
 TEST_F(WebFrameTest, MaximumScrollPositionCanBeNegative) {
   registerMockedHttpURLLoad("rtl-overview-mode.html");
 
   FixedLayoutTestWebViewClient client;
   client.m_screenInfo.deviceScaleFactor = 1;
   int viewportWidth = 640;
   int viewportHeight = 480;
 
   FrameTestHelpers::WebViewHelper webViewHelper;
   webViewHelper.initializeAndLoad(m_baseURL + "rtl-overview-mode.html", true,
                                   nullptr, &client, nullptr,
                                   enableViewportSettings);
   webViewHelper.webView()->setInitialPageScaleOverride(-1);
   webViewHelper.webView()->settings()->setWideViewportQuirkEnabled(true);
   webViewHelper.webView()->settings()->setLoadWithOverviewMode(true);
   webViewHelper.webView()->settings()->setUseWideViewport(true);
   webViewHelper.resize(WebSize(viewportWidth, viewportHeight));
   webViewHelper.webView()->updateAllLifecyclePhases();
 
   FrameView* frameView = webViewHelper.webView()->mainFrameImpl()->frameView();
-  EXPECT_LT(frameView->maximumScrollPosition().x(), 0);
+  EXPECT_LT(frameView->maximumScrollOffset().width(), 0);
 }
 
 TEST_P(ParameterizedWebFrameTest, FullscreenLayerSize) {
   FakeCompositingWebViewClient client;
   registerMockedHttpURLLoad("fullscreen_div.html");
   FrameTestHelpers::WebViewHelper webViewHelper;
   int viewportWidth = 640;
   int viewportHeight = 480;
   client.m_screenInfo.rect.width = viewportWidth;
   client.m_screenInfo.rect.height = viewportHeight;
@@ skipping 2757 matching lines @@
   Platform::current()->getURLLoaderMockFactory()->setLoaderDelegate(nullptr);
 
   Document* document =
       toLocalFrame(helper.webView()->page()->mainFrame())->document();
   EXPECT_TRUE(document->isImageDocument());
   EXPECT_EQ(Resource::DecodeError,
             toImageDocument(document)->cachedImage()->getStatus());
 }
 
 }  // namespace blink