Refactor ScrollableArea::setScrollPosition.

third_party/WebKit/Source/platform/scroll/ScrollAnimatorTest.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:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 44 matching lines @@
  public:
   static MockScrollableArea* create(bool scrollAnimatorEnabled) {
     return new MockScrollableArea(scrollAnimatorEnabled);
   }
 
   MOCK_CONST_METHOD0(visualRectForScrollbarParts, LayoutRect());
   MOCK_CONST_METHOD0(isActive, bool());
   MOCK_CONST_METHOD1(scrollSize, int(ScrollbarOrientation));
   MOCK_CONST_METHOD0(isScrollCornerVisible, bool());
   MOCK_CONST_METHOD0(scrollCornerRect, IntRect());
-  MOCK_METHOD2(setScrollOffset, void(const DoublePoint&, ScrollType));
+  MOCK_METHOD2(updateScrollPosition, void(const DoublePoint&, ScrollType));
   MOCK_METHOD0(scrollControlWasSetNeedsPaintInvalidation, void());
   MOCK_CONST_METHOD0(enclosingScrollableArea, ScrollableArea*());
   MOCK_CONST_METHOD0(minimumScrollPosition, IntPoint());
   MOCK_CONST_METHOD0(maximumScrollPosition, IntPoint());
   MOCK_CONST_METHOD1(visibleContentRect, IntRect(IncludeScrollbarsInRect));
   MOCK_CONST_METHOD0(contentsSize, IntSize());
   MOCK_CONST_METHOD0(scrollbarsCanBeActive, bool());
   MOCK_CONST_METHOD0(scrollableAreaBoundingBox, IntRect());
   MOCK_METHOD0(registerForAnimation, void());
   MOCK_METHOD0(scheduleAnimation, bool());
@@ skipping 77 matching lines @@
   MockScrollableArea* scrollableArea = MockScrollableArea::create(true);
   ScrollAnimator* scrollAnimator =
       new ScrollAnimator(scrollableArea, getMockedTime);
 
   EXPECT_CALL(*scrollableArea, minimumScrollPosition())
       .Times(AtLeast(1))
       .WillRepeatedly(Return(IntPoint()));
   EXPECT_CALL(*scrollableArea, maximumScrollPosition())
       .Times(AtLeast(1))
       .WillRepeatedly(Return(IntPoint(1000, 1000)));
-  EXPECT_CALL(*scrollableArea, setScrollOffset(_, _)).Times(2);
+  EXPECT_CALL(*scrollableArea, updateScrollPosition(_, _)).Times(2);
   // Once from userScroll, once from updateCompositorAnimations.
   EXPECT_CALL(*scrollableArea, registerForAnimation()).Times(2);
   EXPECT_CALL(*scrollableArea, scheduleAnimation())
       .Times(AtLeast(1))
       .WillRepeatedly(Return(true));
 
   // Idle
   EXPECT_FALSE(scrollAnimator->hasAnimationThatRequiresService());
   EXPECT_EQ(scrollAnimator->m_runState,
             ScrollAnimatorCompositorCoordinator::RunState::Idle);
@@ skipping 35 matching lines @@
   MockScrollableArea* scrollableArea = MockScrollableArea::create(true);
   ScrollAnimator* scrollAnimator =
       new ScrollAnimator(scrollableArea, getMockedTime);
 
   EXPECT_CALL(*scrollableArea, minimumScrollPosition())
       .Times(AtLeast(1))
       .WillRepeatedly(Return(IntPoint()));
   EXPECT_CALL(*scrollableArea, maximumScrollPosition())
       .Times(AtLeast(1))
       .WillRepeatedly(Return(IntPoint(1000, 1000)));
-  EXPECT_CALL(*scrollableArea, setScrollOffset(_, _)).Times(9);
+  EXPECT_CALL(*scrollableArea, updateScrollPosition(_, _)).Times(9);
   EXPECT_CALL(*scrollableArea, registerForAnimation()).Times(6);
   EXPECT_CALL(*scrollableArea, scheduleAnimation())
       .Times(AtLeast(1))
       .WillRepeatedly(Return(true));
 
   EXPECT_FALSE(scrollAnimator->hasAnimationThatRequiresService());
 
   ScrollResult result =
       scrollAnimator->userScroll(ScrollByLine, FloatSize(-100, 0));
   EXPECT_FALSE(scrollAnimator->hasAnimationThatRequiresService());
@@ skipping 63 matching lines @@
   MockScrollableArea* scrollableArea = MockScrollableArea::create(true);
   ScrollAnimator* scrollAnimator =
       new ScrollAnimator(scrollableArea, getMockedTime);
 
   EXPECT_CALL(*scrollableArea, minimumScrollPosition())
       .Times(AtLeast(1))
       .WillRepeatedly(Return(IntPoint()));
   EXPECT_CALL(*scrollableArea, maximumScrollPosition())
       .Times(AtLeast(1))
       .WillRepeatedly(Return(IntPoint(1000, 1000)));
-  EXPECT_CALL(*scrollableArea, setScrollOffset(_, _)).Times(3);
+  EXPECT_CALL(*scrollableArea, updateScrollPosition(_, _)).Times(3);
   EXPECT_CALL(*scrollableArea, registerForAnimation()).Times(2);
   EXPECT_CALL(*scrollableArea, scheduleAnimation())
       .Times(AtLeast(1))
       .WillRepeatedly(Return(true));
 
   EXPECT_FALSE(scrollAnimator->hasAnimationThatRequiresService());
 
   // Smooth scroll.
   ScrollResult result =
       scrollAnimator->userScroll(ScrollByLine, FloatSize(100, 0));
@@ skipping 30 matching lines @@
   MockScrollableArea* scrollableArea = MockScrollableArea::create(true);
   TestScrollAnimator* scrollAnimator =
       new TestScrollAnimator(scrollableArea, getMockedTime);
 
   EXPECT_CALL(*scrollableArea, minimumScrollPosition())
       .Times(AtLeast(1))
       .WillRepeatedly(Return(IntPoint()));
   EXPECT_CALL(*scrollableArea, maximumScrollPosition())
       .Times(AtLeast(1))
       .WillRepeatedly(Return(IntPoint(1000, 1000)));
-  EXPECT_CALL(*scrollableArea, setScrollOffset(_, _)).Times(2);
+  EXPECT_CALL(*scrollableArea, updateScrollPosition(_, _)).Times(2);
   // Called from userScroll, updateCompositorAnimations, then
   // takeOverCompositorAnimation (to re-register after RunningOnCompositor).
   EXPECT_CALL(*scrollableArea, registerForAnimation()).Times(3);
   EXPECT_CALL(*scrollableArea, scheduleAnimation())
       .Times(AtLeast(1))
       .WillRepeatedly(Return(true));
 
   EXPECT_FALSE(scrollAnimator->hasAnimationThatRequiresService());
 
   // Smooth scroll.
@@ skipping 33 matching lines @@
   MockScrollableArea* scrollableArea = MockScrollableArea::create(false);
   ScrollAnimator* scrollAnimator =
       new ScrollAnimator(scrollableArea, getMockedTime);
 
   EXPECT_CALL(*scrollableArea, minimumScrollPosition())
       .Times(AtLeast(1))
       .WillRepeatedly(Return(IntPoint()));
   EXPECT_CALL(*scrollableArea, maximumScrollPosition())
       .Times(AtLeast(1))
       .WillRepeatedly(Return(IntPoint(1000, 1000)));
-  EXPECT_CALL(*scrollableArea, setScrollOffset(_, _)).Times(8);
+  EXPECT_CALL(*scrollableArea, updateScrollPosition(_, _)).Times(8);
   EXPECT_CALL(*scrollableArea, registerForAnimation()).Times(0);
 
   scrollAnimator->userScroll(ScrollByLine, FloatSize(100, 0));
   EXPECT_EQ(100, scrollAnimator->currentPosition().x());
   EXPECT_EQ(0, scrollAnimator->currentPosition().y());
   reset(*scrollAnimator);
 
   scrollAnimator->userScroll(ScrollByPage, FloatSize(100, 0));
   EXPECT_EQ(100, scrollAnimator->currentPosition().x());
   EXPECT_EQ(0, scrollAnimator->currentPosition().y());
@@ skipping 17 matching lines @@
   ScrollAnimator* scrollAnimator =
       new ScrollAnimator(scrollableArea, getMockedTime);
 
   EXPECT_CALL(*scrollableArea, minimumScrollPosition())
       .Times(AtLeast(1))
       .WillRepeatedly(Return(IntPoint()));
   EXPECT_CALL(*scrollableArea, maximumScrollPosition())
       .Times(AtLeast(1))
       .WillRepeatedly(Return(IntPoint(1000, 1000)));
   // Called from first userScroll, setCurrentPosition, and second userScroll.
-  EXPECT_CALL(*scrollableArea, setScrollOffset(_, _)).Times(3);
+  EXPECT_CALL(*scrollableArea, updateScrollPosition(_, _)).Times(3);
   // Called from userScroll, updateCompositorAnimations.
   EXPECT_CALL(*scrollableArea, registerForAnimation()).Times(4);
   EXPECT_CALL(*scrollableArea, scheduleAnimation())
       .Times(AtLeast(1))
       .WillRepeatedly(Return(true));
 
   EXPECT_EQ(0, scrollAnimator->currentPosition().x());
   EXPECT_EQ(0, scrollAnimator->currentPosition().y());
 
   // WaitingToSendToCompositor
@@ skipping 47 matching lines @@
   TestScrollAnimator* scrollAnimator =
       new TestScrollAnimator(scrollableArea, getMockedTime);
 
   EXPECT_CALL(*scrollableArea, minimumScrollPosition())
       .Times(AtLeast(1))
       .WillRepeatedly(Return(IntPoint()));
   EXPECT_CALL(*scrollableArea, maximumScrollPosition())
       .Times(AtLeast(1))
       .WillRepeatedly(Return(IntPoint(1000, 1000)));
   // Called when reset, not setting anywhere else.
-  EXPECT_CALL(*scrollableArea, setScrollOffset(_, _)).Times(1);
+  EXPECT_CALL(*scrollableArea, updateScrollPosition(_, _)).Times(1);
   // Called from userScroll, and first update.
   EXPECT_CALL(*scrollableArea, registerForAnimation()).Times(4);
   EXPECT_CALL(*scrollableArea, scheduleAnimation())
       .Times(AtLeast(1))
       .WillRepeatedly(Return(true));
 
   EXPECT_FALSE(scrollAnimator->hasAnimationThatRequiresService());
 
   // First user scroll.
   ScrollResult result =
@@ skipping 98 matching lines @@
   scrollableArea->setScrollAnimator(animator);
 
   EXPECT_CALL(*scrollableArea, minimumScrollPosition())
       .Times(AtLeast(1))
       .WillRepeatedly(Return(IntPoint(-100, -100)));
   EXPECT_CALL(*scrollableArea, maximumScrollPosition())
       .Times(AtLeast(1))
       .WillRepeatedly(Return(IntPoint(1000, 1000)));
   // Twice from tickAnimation, once from reset, and twice from
   // adjustAnimationAndSetScrollPosition.
-  EXPECT_CALL(*scrollableArea, setScrollOffset(_, _)).Times(5);
+  EXPECT_CALL(*scrollableArea, updateScrollPosition(_, _)).Times(5);
   // One from call to userScroll and one from updateCompositorAnimations.
   EXPECT_CALL(*scrollableArea, registerForAnimation()).Times(2);
   EXPECT_CALL(*scrollableArea, scheduleAnimation())
       .Times(AtLeast(1))
       .WillRepeatedly(Return(true));
 
   // Idle
   EXPECT_FALSE(animator->hasAnimationThatRequiresService());
   EXPECT_EQ(FloatPoint(), animator->currentPosition());
 
@@ skipping 28 matching lines @@
       ScrollAnimatorCompositorCoordinator::RunState::PostAnimationCleanup);
   EXPECT_EQ(FloatPoint(110, 90), animator->desiredTargetPosition());
 
   reset(*animator);
 
   // Forced GC in order to finalize objects depending on the mock object.
   ThreadState::current()->collectAllGarbage();
 }
 
 }  // namespace blink