Replace various ScrollableArea scroll methods with setScrollPosition

Source/web/tests/PinchViewportTest.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 
 #include "core/frame/PinchViewport.h"
 
 #include "core/dom/Document.h"
 #include "core/frame/FrameHost.h"
@@ skipping 216 matching lines @@
 
     registerMockedHttpURLLoad("content-width-1000.html");
     navigateTo(m_baseURL + "content-width-1000.html");
 
     FrameView& frameView = *webViewImpl()->mainFrameImpl()->frameView();
     PinchViewport& pinchViewport = frame()->page()->frameHost().pinchViewport();
 
     pinchViewport.setScale(2);
 
     // Fully scroll both viewports.
-    frameView.setScrollPosition(DoublePoint(10000, 10000));
+    frameView.setScrollPosition(DoublePoint(10000, 10000), ProgrammaticScroll);
     pinchViewport.move(FloatSize(10000, 10000));
 
     // Sanity check.
     ASSERT_POINT_EQ(FloatPoint(400, 300), pinchViewport.location());
     ASSERT_POINT_EQ(DoublePoint(200, 1400), frameView.scrollPositionDouble());
 
     DoublePoint expectedLocation = frameView.scrollableArea()->visibleContentRectDouble().location();
 
     // Shrink the WebView, this should cause both viewports to shrink and
     // WebView should do whatever it needs to do to preserve the visible
@@ skipping 588 matching lines @@
 TEST_F(PinchViewportTest, TestNavigateToSmallerFrameViewHistoryItemClobberBug)
 {
     initializeWithAndroidSettings();
     webViewImpl()->resize(IntSize(400, 400));
     webViewImpl()->layout();
 
     registerMockedHttpURLLoad("content-width-1000.html");
     navigateTo(m_baseURL + "content-width-1000.html");
 
     FrameView* frameView = webViewImpl()->mainFrameImpl()->frameView();
-    frameView->setScrollOffset(IntPoint(0, 1000));
+    frameView->setScrollPosition(IntPoint(0, 1000), ProgrammaticScroll);
 
     EXPECT_SIZE_EQ(IntSize(1000, 1000), frameView->frameRect().size());
 
     PinchViewport& pinchViewport = frame()->page()->frameHost().pinchViewport();
     pinchViewport.setScale(2);
     pinchViewport.setLocation(FloatPoint(350, 350));
 
     RefPtrWillBePersistent<HistoryItem> firstItem = webViewImpl()->mainFrameImpl()->frame()->loader().currentItem();
     EXPECT_POINT_EQ(IntPoint(0, 1000), firstItem->scrollPoint());
 
@@ skipping 71 matching lines @@
     webViewImpl()->scrollFocusedNodeIntoRect(IntRect(0, 0, 500, 200));
     EXPECT_POINT_EQ(IntPoint(0, frame()->view()->maximumScrollPosition().y()),
         frame()->view()->scrollPosition());
     EXPECT_FLOAT_POINT_EQ(FloatPoint(125, 150), pinchViewport.visibleRect().location());
 
     // Once more but make sure that we don't move the pinch viewport unless necessary.
     registerMockedHttpURLLoad("pinch-viewport-input-field-long-and-wide.html");
     navigateTo(m_baseURL + "pinch-viewport-input-field-long-and-wide.html");
     webViewImpl()->setInitialFocus(false);
     pinchViewport.setLocation(FloatPoint());
-    frame()->view()->notifyScrollPositionChanged(IntPoint(0, 0));
+    frame()->view()->setScrollPosition(IntPoint(0, 0), ProgrammaticScroll);
     webViewImpl()->resizePinchViewport(IntSize(500, 300));
     pinchViewport.setLocation(FloatPoint(30, 50));
 
     webViewImpl()->setPageScaleFactor(2);
     webViewImpl()->scrollFocusedNodeIntoRect(IntRect(0, 0, 500, 200));
     EXPECT_POINT_EQ(IntPoint(200-30-75, 600-50-65), frame()->view()->scrollPosition());
     EXPECT_FLOAT_POINT_EQ(FloatPoint(30, 50), pinchViewport.visibleRect().location());
 }
 
 // Test that resizing the WebView causes ViewportConstrained objects to relayout.
@@ skipping 128 matching lines @@
 
     FrameView& frameView = *webViewImpl()->mainFrameImpl()->frameView();
     PinchViewport& pinchViewport = frame()->page()->frameHost().pinchViewport();
     Element* inputBox = frame()->document()->getElementById("box");
 
     webViewImpl()->setPageScaleFactor(2);
 
     // The element is already in the view so the scrollIntoView shouldn't move
     // the viewport at all.
     webViewImpl()->setPinchViewportOffset(WebFloatPoint(250.25f, 100.25f));
-    frameView.setScrollPosition(DoublePoint(0, 900.75));
+    frameView.setScrollPosition(DoublePoint(0, 900.75), ProgrammaticScroll);
     inputBox->scrollIntoViewIfNeeded(false);
 
     EXPECT_POINT_EQ(DoublePoint(0, 900.75), frameView.scrollPositionDouble());
     EXPECT_POINT_EQ(FloatPoint(250.25f, 100.25f), pinchViewport.location());
 
     // Change the fractional part of the frameview to one that would round down.
-    frameView.setScrollPosition(DoublePoint(0, 900.125));
+    frameView.setScrollPosition(DoublePoint(0, 900.125), ProgrammaticScroll);
     inputBox->scrollIntoViewIfNeeded(false);
 
     EXPECT_POINT_EQ(DoublePoint(0, 900.125), frameView.scrollPositionDouble());
     EXPECT_POINT_EQ(FloatPoint(250.25f, 100.25f), pinchViewport.location());
 
     // Repeat both tests above with the pinch viewport at a high fractional.
     webViewImpl()->setPinchViewportOffset(WebFloatPoint(250.875f, 100.875f));
-    frameView.setScrollPosition(DoublePoint(0, 900.75));
+    frameView.setScrollPosition(DoublePoint(0, 900.75), ProgrammaticScroll);
     inputBox->scrollIntoViewIfNeeded(false);
 
     EXPECT_POINT_EQ(DoublePoint(0, 900.75), frameView.scrollPositionDouble());
     EXPECT_POINT_EQ(FloatPoint(250.875f, 100.875f), pinchViewport.location());
 
     // Change the fractional part of the frameview to one that would round down.
-    frameView.setScrollPosition(DoublePoint(0, 900.125));
+    frameView.setScrollPosition(DoublePoint(0, 900.125), ProgrammaticScroll);
     inputBox->scrollIntoViewIfNeeded(false);
 
     EXPECT_POINT_EQ(DoublePoint(0, 900.125), frameView.scrollPositionDouble());
     EXPECT_POINT_EQ(FloatPoint(250.875f, 100.875f), pinchViewport.location());
 
     // Both viewports with a 0.5 fraction.
     webViewImpl()->setPinchViewportOffset(WebFloatPoint(250.5f, 100.5f));
-    frameView.setScrollPosition(DoublePoint(0, 900.5));
+    frameView.setScrollPosition(DoublePoint(0, 900.5), ProgrammaticScroll);
     inputBox->scrollIntoViewIfNeeded(false);
 
     EXPECT_POINT_EQ(DoublePoint(0, 900.5), frameView.scrollPositionDouble());
     EXPECT_POINT_EQ(FloatPoint(250.5f, 100.5f), pinchViewport.location());
 }
 
 // Top controls can make an unscrollable page temporarily scrollable, causing
 // a scroll clamp when the page is resized. Make sure this bug is fixed.
 // crbug.com/437620
 TEST_F(PinchViewportTest, TestResizeDoesntChangeScrollOffset)
@@ skipping 56 matching lines @@
     webViewImpl()->applyViewportDeltas(WebFloatSize(), WebFloatSize(), WebFloatSize(), 1, 1);
     EXPECT_SIZE_EQ(IntSize(500, 430), pinchViewport.visibleRect().size());
 
     // Test that the scroll bounds are adjusted appropriately: the pinch viewport
     // should be shrunk by 20px to 430px. The outer viewport was shrunk to maintain the
     // aspect ratio so it's height is 860px.
     pinchViewport.move(FloatPoint(10000, 10000));
     EXPECT_POINT_EQ(FloatPoint(500, 860 - 430), pinchViewport.location());
 
     // The outer viewport (FrameView) should be affected as well.
-    frameView.scrollBy(IntSize(10000, 10000));
+    frameView.scrollBy(IntSize(10000, 10000), UserScroll);
     EXPECT_POINT_EQ(
         expectedMaxFrameViewScrollOffset(pinchViewport, frameView),
         frameView.scrollPosition());
 
     // Simulate bringing up the top controls by 10.5px.
     webViewImpl()->applyViewportDeltas(WebFloatSize(), WebFloatSize(), WebFloatSize(), 1, -10.5f / 20);
     EXPECT_FLOAT_SIZE_EQ(FloatSize(500, 440.5f), pinchViewport.visibleRect().size());
 
     // maximumScrollPosition floors the final values.
     pinchViewport.move(FloatPoint(10000, 10000));
     EXPECT_FLOAT_POINT_EQ(FloatPoint(500, 881 - 440.5f), pinchViewport.location());
 
     // The outer viewport (FrameView) should be affected as well.
-    frameView.scrollBy(IntSize(10000, 10000));
+    frameView.scrollBy(IntSize(10000, 10000), UserScroll);
     EXPECT_POINT_EQ(
         expectedMaxFrameViewScrollOffset(pinchViewport, frameView),
         frameView.scrollPosition());
 }
 
 TEST_F(PinchViewportTest, TestTopControlsAdjustmentWithScale)
 {
     initializeWithAndroidSettings();
     webViewImpl()->resize(IntSize(500, 450));
 
@@ skipping 13 matching lines @@
     // the top controls take up half as much space (in document-space) than
     // they do at an unzoomed level.
     webViewImpl()->applyViewportDeltas(WebFloatSize(), WebFloatSize(), WebFloatSize(), 1, 1);
     EXPECT_SIZE_EQ(IntSize(250, 215), pinchViewport.visibleRect().size());
 
     // Test that the scroll bounds are adjusted appropriately.
     pinchViewport.move(FloatPoint(10000, 10000));
     EXPECT_POINT_EQ(FloatPoint(750, 860 - 215), pinchViewport.location());
 
     // The outer viewport (FrameView) should be affected as well.
-    frameView.scrollBy(IntSize(10000, 10000));
+    frameView.scrollBy(IntSize(10000, 10000), UserScroll);
     IntPoint expected = expectedMaxFrameViewScrollOffset(pinchViewport, frameView);
     EXPECT_POINT_EQ(expected, frameView.scrollPosition());
 
     // Scale back out, FrameView max scroll shouldn't have changed. Pinch
     // viewport should be moved up to accomodate larger view.
     webViewImpl()->applyViewportDeltas(WebFloatSize(), WebFloatSize(), WebFloatSize(), 0.5f, 0);
     EXPECT_EQ(1, pinchViewport.scale());
     EXPECT_POINT_EQ(expected, frameView.scrollPosition());
-    frameView.scrollBy(IntSize(10000, 10000));
+    frameView.scrollBy(IntSize(10000, 10000), UserScroll);
     EXPECT_POINT_EQ(expected, frameView.scrollPosition());
 
     EXPECT_POINT_EQ(FloatPoint(500, 860 - 430), pinchViewport.location());
     pinchViewport.move(FloatPoint(10000, 10000));
     EXPECT_POINT_EQ(FloatPoint(500, 860 - 430), pinchViewport.location());
 
     // Scale out, use a scale that causes fractional rects.
     webViewImpl()->applyViewportDeltas(WebFloatSize(), WebFloatSize(), WebFloatSize(), 0.8f, -1);
     EXPECT_SIZE_EQ(FloatSize(625, 562.5), pinchViewport.visibleRect().size());
 
     // Bring out the top controls by 11
     webViewImpl()->applyViewportDeltas(WebFloatSize(), WebFloatSize(), WebFloatSize(), 1, 11 / 20.f);
     EXPECT_SIZE_EQ(FloatSize(625, 548.75), pinchViewport.visibleRect().size());
 
     // Ensure max scroll offsets are updated properly.
     pinchViewport.move(FloatPoint(10000, 10000));
     EXPECT_FLOAT_POINT_EQ(FloatPoint(375, 877.5 - 548.75), pinchViewport.location());
 
-    frameView.scrollBy(IntSize(10000, 10000));
+    frameView.scrollBy(IntSize(10000, 10000), UserScroll);
     EXPECT_POINT_EQ(
         expectedMaxFrameViewScrollOffset(pinchViewport, frameView),
         frameView.scrollPosition());
 
 }
 
 TEST_F(PinchViewportTest, TestTopControlsAdjustmentAndResize)
 {
     initializeWithAndroidSettings();
     webViewImpl()->resize(IntSize(500, 450));
 
     registerMockedHttpURLLoad("content-width-1000.html");
     navigateTo(m_baseURL + "content-width-1000.html");
 
     PinchViewport& pinchViewport = frame()->page()->frameHost().pinchViewport();
     FrameView& frameView = *webViewImpl()->mainFrameImpl()->frameView();
 
     pinchViewport.setScale(2);
     EXPECT_SIZE_EQ(IntSize(250, 225), pinchViewport.visibleRect().size());
     EXPECT_SIZE_EQ(IntSize(1000, 900), frameView.frameRect().size());
 
     webViewImpl()->setTopControlsHeight(20, false);
 
     webViewImpl()->applyViewportDeltas(WebFloatSize(), WebFloatSize(), WebFloatSize(), 1, 1);
     EXPECT_SIZE_EQ(IntSize(500, 450), pinchViewport.size());
     EXPECT_SIZE_EQ(IntSize(250, 215), pinchViewport.visibleRect().size());
 
     // Scroll all the way to the bottom.
     pinchViewport.move(FloatPoint(10000, 10000));
-    frameView.scrollBy(IntSize(10000, 10000));
+    frameView.scrollBy(IntSize(10000, 10000), UserScroll);
     IntPoint frameViewExpected = expectedMaxFrameViewScrollOffset(pinchViewport, frameView);
     FloatPoint pinchViewportExpected = FloatPoint(750, 860 - 215);
     EXPECT_POINT_EQ(pinchViewportExpected, pinchViewport.location());
     EXPECT_POINT_EQ(frameViewExpected, frameView.scrollPosition());
 
     // Resize the widget to match the top controls adjustment. Ensure that scroll
     // offsets don't get clamped in the the process.
     webViewImpl()->setTopControlsHeight(20, true);
     webViewImpl()->resize(WebSize(500, 430));
 
@@ skipping 16 matching lines @@
     webViewImpl()->resize(IntSize(1000, 1000));
 
     registerMockedHttpURLLoad("content-width-1000.html");
     navigateTo(m_baseURL + "content-width-1000.html");
 
     // Scroll the FrameView to the bottom of the page but "hide" the top
     // controls on the compositor side so the max scroll position should account
     // for the full viewport height.
     webViewImpl()->applyViewportDeltas(WebFloatSize(), WebFloatSize(), WebFloatSize(), 1, -1);
     FrameView& frameView = *webViewImpl()->mainFrameImpl()->frameView();
-    frameView.setScrollPosition(IntPoint(0, 10000));
+    frameView.setScrollPosition(IntPoint(0, 10000), ProgrammaticScroll);
     EXPECT_EQ(500, frameView.scrollPositionDouble().y());
 
     // Now send the resize, make sure the scroll offset doesn't change.
     webViewImpl()->setTopControlsHeight(500, false);
     webViewImpl()->resize(IntSize(1000, 1500));
     EXPECT_EQ(500, frameView.scrollPositionDouble().y());
 }
 
 // Tests that the layout viewport's scroll layer bounds are updated in a compositing
 // change update. crbug.com/423188.
@@ skipping 232 matching lines @@
     navigateTo(m_baseURL + "hit-test.html");
 
     webViewImpl()->resize(IntSize(500, 500));
     webViewImpl()->layout();
 
     WebDocument webDoc = webViewImpl()->mainFrame()->document();
     FrameView& frameView = *webViewImpl()->mainFrameImpl()->frameView();
 
     webViewImpl()->setPageScaleFactor(2);
     webViewImpl()->setPinchViewportOffset(WebFloatPoint(200, 230));
-    frameView.setScrollPosition(DoublePoint(400, 1100));
+    frameView.setScrollPosition(DoublePoint(400, 1100), ProgrammaticScroll);
 
     // Because of where the pinch viewport is located, this should hit the bottom right
     // target (target 4).
     WebAXObject hitNode = webDoc.accessibilityObject().hitTest(WebPoint(154, 165));
     EXPECT_EQ(std::string("Target4"), hitNode.title().utf8());
 }
 
 // Tests that the maximum scroll offset of the viewport can be fractional.
 TEST_F(PinchViewportTest, TestCoordinateTransforms)
 {
@@ skipping 57 matching lines @@
     registerMockedHttpURLLoad("window_dimensions_wide_div.html");
     webViewImpl()->resize(IntSize(800, 600));
     navigateTo(m_baseURL + "window_dimensions_wide_div.html");
 
     Element* output = frame()->document()->getElementById("output");
     ASSERT(output);
     EXPECT_EQ(std::string("2000x1500"), std::string(output->innerHTML().ascii().data()));
 }
 
 } // namespace