Use float for scroll offset.

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

 /*
  * Copyright (C) 2015 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 122 matching lines @@
   }
   VisualViewport& visualViewport() const {
     return m_helper.webView()->page()->frameHost().visualViewport();
   }
 
  private:
   std::string m_baseURL;
   FrameTestHelpers::WebViewHelper m_helper;
 };
 
-#define EXPECT_POINT_EQ(expected, actual)           \
-  do {                                              \
-    EXPECT_DOUBLE_EQ((expected).x(), (actual).x()); \
-    EXPECT_DOUBLE_EQ((expected).y(), (actual).y()); \
+#define EXPECT_SIZE_EQ(expected, actual)                     \
+  do {                                                       \
+    EXPECT_FLOAT_EQ((expected).width(), (actual).width());   \
+    EXPECT_FLOAT_EQ((expected).height(), (actual).height()); \
   } while (false)
 
 // Disable these tests on Mac OSX until further investigation.
 // Local build on Mac is OK but the bot fails. This is not an issue as
 // Top Controls are currently only used on Android.
 #if OS(MACOSX)
 #define MAYBE(test) DISABLED_##test
 #else
 #define MAYBE(test) test
 #endif
 
 // Scrolling down should hide top controls.
 TEST_F(TopControlsTest, MAYBE(HideOnScrollDown)) {
   WebViewImpl* webView = initialize();
   // initialize top controls to be shown.
   webView->resizeWithTopControls(webView->size(), 50.f, true);
   webView->topControls().setShownRatio(1);
 
   webView->handleInputEvent(generateEvent(WebInputEvent::GestureScrollBegin));
   EXPECT_FLOAT_EQ(50.f, webView->topControls().contentOffset());
 
   // Top controls should be scrolled partially and page should not scroll.
   webView->handleInputEvent(
       generateEvent(WebInputEvent::GestureScrollUpdate, 0, -25.f));
   EXPECT_FLOAT_EQ(25.f, webView->topControls().contentOffset());
-  EXPECT_POINT_EQ(IntPoint(0, 0), frame()->view()->scrollPosition());
+  EXPECT_SIZE_EQ(ScrollOffset(0, 0), frame()->view()->scrollOffset());
 
   // Top controls should consume 25px and become hidden. Excess scroll should be
   // consumed by the page.
   webView->handleInputEvent(
       generateEvent(WebInputEvent::GestureScrollUpdate, 0, -40.f));
   EXPECT_FLOAT_EQ(0.f, webView->topControls().contentOffset());
-  EXPECT_POINT_EQ(IntPoint(0, 15), frame()->view()->scrollPosition());
+  EXPECT_SIZE_EQ(ScrollOffset(0, 15), frame()->view()->scrollOffset());
 
   // Only page should consume scroll
   webView->handleInputEvent(
       generateEvent(WebInputEvent::GestureScrollUpdate, 0, -20.f));
   EXPECT_FLOAT_EQ(0.f, webView->topControls().contentOffset());
-  EXPECT_POINT_EQ(IntPoint(0, 35), frame()->view()->scrollPosition());
+  EXPECT_SIZE_EQ(ScrollOffset(0, 35), frame()->view()->scrollOffset());
 }
 
 // Scrolling up should show top controls.
 TEST_F(TopControlsTest, MAYBE(ShowOnScrollUp)) {
   WebViewImpl* webView = initialize();
   // initialize top controls to be hidden.
   webView->resizeWithTopControls(webView->size(), 50.f, false);
   webView->topControls().setShownRatio(0);
 
   webView->handleInputEvent(generateEvent(WebInputEvent::GestureScrollBegin));
   EXPECT_FLOAT_EQ(0.f, webView->topControls().contentOffset());
 
   webView->handleInputEvent(
       generateEvent(WebInputEvent::GestureScrollUpdate, 0, 10.f));
   EXPECT_FLOAT_EQ(10.f, webView->topControls().contentOffset());
-  EXPECT_POINT_EQ(IntPoint(0, 0), frame()->view()->scrollPosition());
+  EXPECT_SIZE_EQ(ScrollOffset(0, 0), frame()->view()->scrollOffset());
 
   webView->handleInputEvent(
       generateEvent(WebInputEvent::GestureScrollUpdate, 0, 50.f));
   EXPECT_FLOAT_EQ(50.f, webView->topControls().contentOffset());
-  EXPECT_POINT_EQ(IntPoint(0, 0), frame()->view()->scrollPosition());
+  EXPECT_SIZE_EQ(ScrollOffset(0, 0), frame()->view()->scrollOffset());
 }
 
 // Scrolling up after previous scroll downs should cause top controls to be
 // shown only after all previously scrolled down amount is compensated.
 TEST_F(TopControlsTest, MAYBE(ScrollDownThenUp)) {
   WebViewImpl* webView = initialize();
   // initialize top controls to be shown and position page at 100px.
   webView->resizeWithTopControls(webView->size(), 50.f, true);
   webView->topControls().setShownRatio(1);
-  frame()->view()->getScrollableArea()->setScrollPosition(IntPoint(0, 100),
-                                                          ProgrammaticScroll);
+  frame()->view()->getScrollableArea()->setScrollOffset(ScrollOffset(0, 100),
+                                                        ProgrammaticScroll);
 
   webView->handleInputEvent(generateEvent(WebInputEvent::GestureScrollBegin));
   EXPECT_FLOAT_EQ(50.f, webView->topControls().contentOffset());
 
   // Scroll down to completely hide top controls. Excess deltaY (100px) should
   // be consumed by the page.
   webView->handleInputEvent(
       generateEvent(WebInputEvent::GestureScrollUpdate, 0, -150.f));
   EXPECT_FLOAT_EQ(0.f, webView->topControls().contentOffset());
-  EXPECT_POINT_EQ(IntPoint(0, 200), frame()->view()->scrollPosition());
+  EXPECT_SIZE_EQ(ScrollOffset(0, 200), frame()->view()->scrollOffset());
 
   // Scroll up and ensure the top controls does not move until we recover 100px
   // previously scrolled.
   webView->handleInputEvent(
       generateEvent(WebInputEvent::GestureScrollUpdate, 0, 40.f));
   EXPECT_FLOAT_EQ(0.f, webView->topControls().contentOffset());
-  EXPECT_POINT_EQ(IntPoint(0, 160), frame()->view()->scrollPosition());
+  EXPECT_SIZE_EQ(ScrollOffset(0, 160), frame()->view()->scrollOffset());
 
   webView->handleInputEvent(
       generateEvent(WebInputEvent::GestureScrollUpdate, 0, 60.f));
   EXPECT_FLOAT_EQ(0.f, webView->topControls().contentOffset());
-  EXPECT_POINT_EQ(IntPoint(0, 100), frame()->view()->scrollPosition());
+  EXPECT_SIZE_EQ(ScrollOffset(0, 100), frame()->view()->scrollOffset());
 
   // Now we have hit the threshold so further scroll up should be consumed by
   // top controls.
   webView->handleInputEvent(
       generateEvent(WebInputEvent::GestureScrollUpdate, 0, 30.f));
   EXPECT_FLOAT_EQ(30.f, webView->topControls().contentOffset());
-  EXPECT_POINT_EQ(IntPoint(0, 100), frame()->view()->scrollPosition());
+  EXPECT_SIZE_EQ(ScrollOffset(0, 100), frame()->view()->scrollOffset());
 
   // Once top control is fully shown then page should consume any excess scroll.
   webView->handleInputEvent(
       generateEvent(WebInputEvent::GestureScrollUpdate, 0, 70.f));
   EXPECT_FLOAT_EQ(50.f, webView->topControls().contentOffset());
-  EXPECT_POINT_EQ(IntPoint(0, 50), frame()->view()->scrollPosition());
+  EXPECT_SIZE_EQ(ScrollOffset(0, 50), frame()->view()->scrollOffset());
 }
 
 // Scrolling down should always cause visible top controls to start hiding even
 // if we have been scrolling up previously.
 TEST_F(TopControlsTest, MAYBE(ScrollUpThenDown)) {
   WebViewImpl* webView = initialize();
   // initialize top controls to be hidden and position page at 100px.
   webView->resizeWithTopControls(webView->size(), 50.f, false);
   webView->topControls().setShownRatio(0);
-  frame()->view()->getScrollableArea()->setScrollPosition(IntPoint(0, 100),
-                                                          ProgrammaticScroll);
+  frame()->view()->getScrollableArea()->setScrollOffset(ScrollOffset(0, 100),
+                                                        ProgrammaticScroll);
 
   webView->handleInputEvent(generateEvent(WebInputEvent::GestureScrollBegin));
   EXPECT_FLOAT_EQ(0.f, webView->topControls().contentOffset());
 
   // Scroll up to completely show top controls. Excess deltaY (50px) should be
   // consumed by the page.
   webView->handleInputEvent(
       generateEvent(WebInputEvent::GestureScrollUpdate, 0, 100.f));
   EXPECT_FLOAT_EQ(50.f, webView->topControls().contentOffset());
-  EXPECT_POINT_EQ(IntPoint(0, 50), frame()->view()->scrollPosition());
+  EXPECT_SIZE_EQ(ScrollOffset(0, 50), frame()->view()->scrollOffset());
 
   // Scroll down and ensure only top controls is scrolled
   webView->handleInputEvent(
       generateEvent(WebInputEvent::GestureScrollUpdate, 0, -40.f));
   EXPECT_FLOAT_EQ(10.f, webView->topControls().contentOffset());
-  EXPECT_POINT_EQ(IntPoint(0, 50), frame()->view()->scrollPosition());
+  EXPECT_SIZE_EQ(ScrollOffset(0, 50), frame()->view()->scrollOffset());
 
   webView->handleInputEvent(
       generateEvent(WebInputEvent::GestureScrollUpdate, 0, -60.f));
   EXPECT_FLOAT_EQ(0.f, webView->topControls().contentOffset());
-  EXPECT_POINT_EQ(IntPoint(0, 100), frame()->view()->scrollPosition());
+  EXPECT_SIZE_EQ(ScrollOffset(0, 100), frame()->view()->scrollOffset());
 }
 
 // Top controls should not consume horizontal scroll.
 TEST_F(TopControlsTest, MAYBE(HorizontalScroll)) {
   WebViewImpl* webView = initialize();
   // initialize top controls to be shown.
   webView->resizeWithTopControls(webView->size(), 50.f, true);
   webView->topControls().setShownRatio(1);
 
   webView->handleInputEvent(generateEvent(WebInputEvent::GestureScrollBegin));
   EXPECT_FLOAT_EQ(50.f, webView->topControls().contentOffset());
 
   // Top controls should not consume horizontal scroll.
   webView->handleInputEvent(
       generateEvent(WebInputEvent::GestureScrollUpdate, -110.f, -100.f));
   EXPECT_FLOAT_EQ(0.f, webView->topControls().contentOffset());
-  EXPECT_POINT_EQ(IntPoint(110, 50), frame()->view()->scrollPosition());
+  EXPECT_SIZE_EQ(ScrollOffset(110, 50), frame()->view()->scrollOffset());
 
   webView->handleInputEvent(
       generateEvent(WebInputEvent::GestureScrollUpdate, -40.f, 0));
   EXPECT_FLOAT_EQ(0.f, webView->topControls().contentOffset());
-  EXPECT_POINT_EQ(IntPoint(150, 50), frame()->view()->scrollPosition());
+  EXPECT_SIZE_EQ(ScrollOffset(150, 50), frame()->view()->scrollOffset());
 }
 
 // Page scale should not impact top controls scrolling
 TEST_F(TopControlsTest, MAYBE(PageScaleHasNoImpact)) {
   WebViewImpl* webView = initialize();
   webViewImpl()->setDefaultPageScaleLimits(0.25f, 5);
   webView->setPageScaleFactor(2.0);
 
   // Initialize top controls to be shown.
   webView->resizeWithTopControls(webView->size(), 50.f, true);
   webView->topControls().setShownRatio(1);
 
   webView->handleInputEvent(generateEvent(WebInputEvent::GestureScrollBegin));
   EXPECT_FLOAT_EQ(50.f, webView->topControls().contentOffset());
 
   // Top controls should be scrolled partially and page should not scroll.
   webView->handleInputEvent(
       generateEvent(WebInputEvent::GestureScrollUpdate, 0, -20.f));
   EXPECT_FLOAT_EQ(30.f, webView->topControls().contentOffset());
-  EXPECT_POINT_EQ(IntPoint(0, 0),
-                  frame()->view()->getScrollableArea()->scrollPositionDouble());
+  EXPECT_SIZE_EQ(ScrollOffset(0, 0),
+                 frame()->view()->getScrollableArea()->scrollOffset());
 
   // Top controls should consume 30px and become hidden. Excess scroll should be
   // consumed by the page at 2x scale.
   webView->handleInputEvent(
       generateEvent(WebInputEvent::GestureScrollUpdate, 0, -70.f));
   EXPECT_FLOAT_EQ(0.f, webView->topControls().contentOffset());
-  EXPECT_POINT_EQ(IntPoint(0, 20),
-                  frame()->view()->getScrollableArea()->scrollPositionDouble());
+  EXPECT_SIZE_EQ(ScrollOffset(0, 20),
+                 frame()->view()->getScrollableArea()->scrollOffset());
 
   webView->handleInputEvent(generateEvent(WebInputEvent::GestureScrollEnd));
 
   // Change page scale and test.
   webView->setPageScaleFactor(0.5);
 
   webView->handleInputEvent(generateEvent(WebInputEvent::GestureScrollBegin));
   EXPECT_FLOAT_EQ(0.f, webView->topControls().contentOffset());
-  EXPECT_POINT_EQ(IntPoint(0, 20),
-                  frame()->view()->getScrollableArea()->scrollPositionDouble());
+  EXPECT_SIZE_EQ(ScrollOffset(0, 20),
+                 frame()->view()->getScrollableArea()->scrollOffset());
 
   webView->handleInputEvent(
       generateEvent(WebInputEvent::GestureScrollUpdate, 0, 50.f));
   EXPECT_FLOAT_EQ(50.f, webView->topControls().contentOffset());
-  EXPECT_POINT_EQ(IntPoint(0, 20),
-                  frame()->view()->getScrollableArea()->scrollPositionDouble());
+  EXPECT_SIZE_EQ(ScrollOffset(0, 20),
+                 frame()->view()->getScrollableArea()->scrollOffset());
 
   // At 0.5x scale scrolling 10px should take us to the top of the page.
   webView->handleInputEvent(
       generateEvent(WebInputEvent::GestureScrollUpdate, 0, 10.f));
   EXPECT_FLOAT_EQ(50.f, webView->topControls().contentOffset());
-  EXPECT_POINT_EQ(IntPoint(0, 0),
-                  frame()->view()->getScrollableArea()->scrollPositionDouble());
+  EXPECT_SIZE_EQ(ScrollOffset(0, 0),
+                 frame()->view()->getScrollableArea()->scrollOffset());
 }
 
 // Some scroll deltas result in a shownRatio that can't be realized in a
 // floating-point number. Make sure that if the top controls aren't fully
 // scrolled, scrollBy doesn't return any excess delta. i.e. There should be no
 // slippage between the content and top controls.
 TEST_F(TopControlsTest, MAYBE(FloatingPointSlippage)) {
   WebViewImpl* webView = initialize();
   webViewImpl()->setDefaultPageScaleLimits(0.25f, 5);
   webView->setPageScaleFactor(2.0);
@@ skipping 10 matching lines @@
   // that scroll still consumes the whole delta.
   FloatSize remainingDelta = webView->topControls().scrollBy(FloatSize(0, 10));
   EXPECT_EQ(0, remainingDelta.height());
 }
 
 // Scrollable subregions should scroll before top controls
 TEST_F(TopControlsTest, MAYBE(ScrollableSubregionScrollFirst)) {
   WebViewImpl* webView = initialize("overflow-scrolling.html");
   webView->resizeWithTopControls(webView->size(), 50.f, true);
   webView->topControls().setShownRatio(1);
-  frame()->view()->getScrollableArea()->setScrollPosition(IntPoint(0, 50),
-                                                          ProgrammaticScroll);
+  frame()->view()->getScrollableArea()->setScrollOffset(ScrollOffset(0, 50),
+                                                        ProgrammaticScroll);
 
   // Test scroll down
   // Scroll down should scroll the overflow div first but top controls and main
   // frame should not scroll.
   verticalScroll(-800.f);
   EXPECT_FLOAT_EQ(50.f, webView->topControls().contentOffset());
-  EXPECT_POINT_EQ(IntPoint(0, 50), frame()->view()->scrollPosition());
+  EXPECT_SIZE_EQ(ScrollOffset(0, 50), frame()->view()->scrollOffset());
 
   // Continued scroll down should start hiding top controls but main frame
   // should not scroll.
   verticalScroll(-40.f);
   EXPECT_FLOAT_EQ(10.f, webView->topControls().contentOffset());
-  EXPECT_POINT_EQ(IntPoint(0, 50), frame()->view()->scrollPosition());
+  EXPECT_SIZE_EQ(ScrollOffset(0, 50), frame()->view()->scrollOffset());
 
   // Continued scroll down should scroll down the main frame
   verticalScroll(-40.f);
   EXPECT_FLOAT_EQ(0.f, webView->topControls().contentOffset());
-  EXPECT_POINT_EQ(IntPoint(0, 80), frame()->view()->scrollPosition());
+  EXPECT_SIZE_EQ(ScrollOffset(0, 80), frame()->view()->scrollOffset());
 
   // Test scroll up
   // scroll up should scroll overflow div first
   verticalScroll(800.f);
   EXPECT_FLOAT_EQ(0.f, webView->topControls().contentOffset());
-  EXPECT_POINT_EQ(IntPoint(0, 80), frame()->view()->scrollPosition());
+  EXPECT_SIZE_EQ(ScrollOffset(0, 80), frame()->view()->scrollOffset());
 
   // Continued scroll up should start showing top controls but main frame should
   // not scroll.
   verticalScroll(40.f);
   EXPECT_FLOAT_EQ(40.f, webView->topControls().contentOffset());
-  EXPECT_POINT_EQ(IntPoint(0, 80), frame()->view()->scrollPosition());
+  EXPECT_SIZE_EQ(ScrollOffset(0, 80), frame()->view()->scrollOffset());
 
   // Continued scroll down up scroll up the main frame
   verticalScroll(40.f);
   EXPECT_FLOAT_EQ(50.f, webView->topControls().contentOffset());
-  EXPECT_POINT_EQ(IntPoint(0, 50), frame()->view()->scrollPosition());
+  EXPECT_SIZE_EQ(ScrollOffset(0, 50), frame()->view()->scrollOffset());
 }
 
 // Scrollable iframes should scroll before top controls
 TEST_F(TopControlsTest, MAYBE(ScrollableIframeScrollFirst)) {
   WebViewImpl* webView = initialize("iframe-scrolling.html");
   webView->resizeWithTopControls(webView->size(), 50.f, true);
   webView->topControls().setShownRatio(1);
-  frame()->view()->getScrollableArea()->setScrollPosition(IntPoint(0, 50),
-                                                          ProgrammaticScroll);
+  frame()->view()->getScrollableArea()->setScrollOffset(ScrollOffset(0, 50),
+                                                        ProgrammaticScroll);
 
   // Test scroll down
   // Scroll down should scroll the iframe first but top controls and main frame
   // should not scroll.
   verticalScroll(-800.f);
   EXPECT_FLOAT_EQ(50.f, webView->topControls().contentOffset());
-  EXPECT_POINT_EQ(IntPoint(0, 50), frame()->view()->scrollPosition());
+  EXPECT_SIZE_EQ(ScrollOffset(0, 50), frame()->view()->scrollOffset());
 
   // Continued scroll down should start hiding top controls but main frame
   // should not scroll.
   verticalScroll(-40.f);
   EXPECT_FLOAT_EQ(10.f, webView->topControls().contentOffset());
-  EXPECT_POINT_EQ(IntPoint(0, 50), frame()->view()->scrollPosition());
+  EXPECT_SIZE_EQ(ScrollOffset(0, 50), frame()->view()->scrollOffset());
 
   // Continued scroll down should scroll down the main frame
   verticalScroll(-40.f);
   EXPECT_FLOAT_EQ(0.f, webView->topControls().contentOffset());
-  EXPECT_POINT_EQ(IntPoint(0, 80), frame()->view()->scrollPosition());
+  EXPECT_SIZE_EQ(ScrollOffset(0, 80), frame()->view()->scrollOffset());
 
   // Test scroll up
   // scroll up should scroll iframe first
   verticalScroll(800.f);
   EXPECT_FLOAT_EQ(0.f, webView->topControls().contentOffset());
-  EXPECT_POINT_EQ(IntPoint(0, 80), frame()->view()->scrollPosition());
+  EXPECT_SIZE_EQ(ScrollOffset(0, 80), frame()->view()->scrollOffset());
 
   // Continued scroll up should start showing top controls but main frame should
   // not scroll.
   verticalScroll(40.f);
   EXPECT_FLOAT_EQ(40.f, webView->topControls().contentOffset());
-  EXPECT_POINT_EQ(IntPoint(0, 80), frame()->view()->scrollPosition());
+  EXPECT_SIZE_EQ(ScrollOffset(0, 80), frame()->view()->scrollOffset());
 
   // Continued scroll down up scroll up the main frame
   verticalScroll(40.f);
   EXPECT_FLOAT_EQ(50.f, webView->topControls().contentOffset());
-  EXPECT_POINT_EQ(IntPoint(0, 50), frame()->view()->scrollPosition());
+  EXPECT_SIZE_EQ(ScrollOffset(0, 50), frame()->view()->scrollOffset());
 }
 
 // Top controls visibility should remain consistent when height is changed.
 TEST_F(TopControlsTest, MAYBE(HeightChangeMaintainsVisibility)) {
   WebViewImpl* webView = initialize();
   webView->resizeWithTopControls(webView->size(), 20.f, false);
   webView->topControls().setShownRatio(0);
 
   webView->resizeWithTopControls(webView->size(), 20.f, false);
   EXPECT_FLOAT_EQ(0.f, webView->topControls().contentOffset());
 
   webView->resizeWithTopControls(webView->size(), 40.f, false);
   EXPECT_FLOAT_EQ(0.f, webView->topControls().contentOffset());
 
   // Scroll up to show top controls.
   verticalScroll(40.f);
   EXPECT_FLOAT_EQ(40.f, webView->topControls().contentOffset());
 
   // Changing height of a fully shown top controls should correctly adjust
   // content offset
   webView->resizeWithTopControls(webView->size(), 30.f, false);
   EXPECT_FLOAT_EQ(30.f, webView->topControls().contentOffset());
 }
 
 // Zero delta should not have any effect on top controls.
 TEST_F(TopControlsTest, MAYBE(ZeroHeightMeansNoEffect)) {
   WebViewImpl* webView = initialize();
   webView->resizeWithTopControls(webView->size(), 0, false);
   webView->topControls().setShownRatio(0);
-  frame()->view()->getScrollableArea()->setScrollPosition(IntPoint(0, 100),
-                                                          ProgrammaticScroll);
+  frame()->view()->getScrollableArea()->setScrollOffset(ScrollOffset(0, 100),
+                                                        ProgrammaticScroll);
 
   EXPECT_FLOAT_EQ(0.f, webView->topControls().contentOffset());
 
   verticalScroll(20.f);
   EXPECT_FLOAT_EQ(0.f, webView->topControls().contentOffset());
-  EXPECT_POINT_EQ(IntPoint(0, 80), frame()->view()->scrollPosition());
+  EXPECT_SIZE_EQ(ScrollOffset(0, 80), frame()->view()->scrollOffset());
 
   verticalScroll(-30.f);
   EXPECT_FLOAT_EQ(0.f, webView->topControls().contentOffset());
-  EXPECT_POINT_EQ(IntPoint(0, 110), frame()->view()->scrollPosition());
+  EXPECT_SIZE_EQ(ScrollOffset(0, 110), frame()->view()->scrollOffset());
 
   webView->topControls().setShownRatio(1);
   EXPECT_FLOAT_EQ(0.f, webView->topControls().contentOffset());
 }
 
 // Top controls should not hide when scrolling up past limit
 TEST_F(TopControlsTest, MAYBE(ScrollUpPastLimitDoesNotHide)) {
   WebViewImpl* webView = initialize();
   // Initialize top controls to be shown
   webView->resizeWithTopControls(webView->size(), 50.f, true);
@@ skipping 21 matching lines @@
   verticalScroll(-30.f);
   // Top controls should not move because neither frameview nor visual viewport
   // are scrollable
   EXPECT_FLOAT_EQ(50.f, webView->topControls().contentOffset());
 }
 
 // Top controls should honor its constraints
 TEST_F(TopControlsTest, MAYBE(StateConstraints)) {
   WebViewImpl* webView = initialize();
   webView->resizeWithTopControls(webView->size(), 50.f, false);
-  frame()->view()->getScrollableArea()->setScrollPosition(IntPoint(0, 100),
-                                                          ProgrammaticScroll);
+  frame()->view()->getScrollableArea()->setScrollOffset(ScrollOffset(0, 100),
+                                                        ProgrammaticScroll);
 
   // Setting permitted state should change the content offset to match the
   // constraint.
   webView->updateTopControlsState(WebTopControlsShown, WebTopControlsShown,
                                   false);
   EXPECT_FLOAT_EQ(50.f, webView->topControls().contentOffset());
 
   // Only shown state is permitted so controls cannot hide
   verticalScroll(-20.f);
   EXPECT_FLOAT_EQ(50, webView->topControls().contentOffset());
-  EXPECT_POINT_EQ(IntPoint(0, 120), frame()->view()->scrollPosition());
+  EXPECT_SIZE_EQ(ScrollOffset(0, 120), frame()->view()->scrollOffset());
 
   // Setting permitted state should change content offset to match the
   // constraint.
   webView->updateTopControlsState(WebTopControlsHidden, WebTopControlsHidden,
                                   false);
   EXPECT_FLOAT_EQ(0, webView->topControls().contentOffset());
 
   // Only hidden state is permitted so controls cannot show
   verticalScroll(30.f);
   EXPECT_FLOAT_EQ(0, webView->topControls().contentOffset());
-  EXPECT_POINT_EQ(IntPoint(0, 90), frame()->view()->scrollPosition());
+  EXPECT_SIZE_EQ(ScrollOffset(0, 90), frame()->view()->scrollOffset());
 
   // Setting permitted state to "both" should not change content offset.
   webView->updateTopControlsState(WebTopControlsBoth, WebTopControlsBoth,
                                   false);
   EXPECT_FLOAT_EQ(0, webView->topControls().contentOffset());
 
   // Both states are permitted so controls can either show or hide
   verticalScroll(50.f);
   EXPECT_FLOAT_EQ(50, webView->topControls().contentOffset());
-  EXPECT_POINT_EQ(IntPoint(0, 90), frame()->view()->scrollPosition());
+  EXPECT_SIZE_EQ(ScrollOffset(0, 90), frame()->view()->scrollOffset());
 
   verticalScroll(-50.f);
   EXPECT_FLOAT_EQ(0, webView->topControls().contentOffset());
-  EXPECT_POINT_EQ(IntPoint(0, 90), frame()->view()->scrollPosition());
+  EXPECT_SIZE_EQ(ScrollOffset(0, 90), frame()->view()->scrollOffset());
 
   // Setting permitted state to "both" should not change an in-flight offset.
   verticalScroll(20.f);
   EXPECT_FLOAT_EQ(20, webView->topControls().contentOffset());
   webView->updateTopControlsState(WebTopControlsBoth, WebTopControlsBoth,
                                   false);
   EXPECT_FLOAT_EQ(20, webView->topControls().contentOffset());
 
   // An animated state change shouldn't cause a change to the content offset
   // since it'll be driven from the compositor.
@@ skipping 205 matching lines @@
 
   // Zoom in to 2X and fully scroll both viewports.
   webView->setPageScaleFactor(pageScale);
   {
     webView->handleInputEvent(generateEvent(WebInputEvent::GestureScrollBegin));
     webView->handleInputEvent(
         generateEvent(WebInputEvent::GestureScrollUpdate, 0, -10000));
 
     ASSERT_EQ(0.f, webView->topControls().contentOffset());
 
-    EXPECT_EQ(expectedVisualOffset, visualViewport().location().y());
+    EXPECT_EQ(expectedVisualOffset, visualViewport().scrollOffset().height());
     EXPECT_EQ(expectedLayoutOffset,
-              view->layoutViewportScrollableArea()->scrollPosition().y());
-    EXPECT_EQ(expectedRootOffset, rootViewport->scrollPosition().y());
+              view->layoutViewportScrollableArea()->scrollOffset().height());
+    EXPECT_EQ(expectedRootOffset, rootViewport->scrollOffset().height());
 
     webView->handleInputEvent(generateEvent(WebInputEvent::GestureScrollEnd));
   }
 
   // Commit the top controls resize so that the top controls do not shrink the
   // layout size. This should not have moved any of the viewports.
   webView->resizeWithTopControls(
       WebSize(800, layoutViewportHeight + topControlsHeight), topControlsHeight,
       false);
   webView->updateAllLifecyclePhases();
-  ASSERT_EQ(expectedVisualOffset, visualViewport().location().y());
+  ASSERT_EQ(expectedVisualOffset, visualViewport().scrollOffset().height());
   ASSERT_EQ(expectedLayoutOffset,
-            view->layoutViewportScrollableArea()->scrollPosition().y());
-  ASSERT_EQ(expectedRootOffset, rootViewport->scrollPosition().y());
+            view->layoutViewportScrollableArea()->scrollOffset().height());
+  ASSERT_EQ(expectedRootOffset, rootViewport->scrollOffset().height());
 
   // Now scroll back up just enough to show the top controls. The top controls
   // should shrink both viewports but the layout viewport by a greater amount.
   // This means the visual viewport's offset must be clamped to keep it within
   // the layout viewport. Make sure we adjust the scroll position to account
   // for this and keep the visual viewport at the same location relative to
   // the document (i.e. the user shouldn't see a movement).
   {
     webView->handleInputEvent(generateEvent(WebInputEvent::GestureScrollBegin));
     webView->handleInputEvent(
         generateEvent(WebInputEvent::GestureScrollUpdate, 0, 80));
 
     visualViewport().clampToBoundaries();
-    view->setScrollPosition(view->scrollPosition(), ProgrammaticScroll);
+    view->setScrollOffset(view->scrollOffset(), ProgrammaticScroll);
 
     ASSERT_EQ(80.f, webView->topControls().contentOffset());
-    EXPECT_EQ(expectedRootOffset, rootViewport->scrollPosition().y());
+    EXPECT_EQ(expectedRootOffset, rootViewport->scrollOffset().height());
 
     webView->handleInputEvent(generateEvent(WebInputEvent::GestureScrollEnd));
   }
 }
 
 }  // namespace blink