Revert of Run smooth scroll animations on the compositor when possible

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 55 matching lines @@
     MOCK_METHOD2(setScrollOffset, void(const IntPoint&, 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());
 
     bool userInputScrollable(ScrollbarOrientation) const override { return true; }
     bool shouldPlaceVerticalScrollbarOnLeft() const override { return false; }
     IntPoint scrollPosition() const override { return IntPoint(); }
     int visibleHeight() const override { return 768; }
     int visibleWidth() const override { return 1024; }
     bool scrollAnimatorEnabled() const override { return m_scrollAnimatorEnabled; }
     int pageStep(ScrollbarOrientation) const override { return 0; }
 
     DEFINE_INLINE_VIRTUAL_TRACE()
     {
         ScrollableArea::trace(visitor);
     }
 
 private:
     explicit MockScrollableArea(bool scrollAnimatorEnabled)
         : m_scrollAnimatorEnabled(scrollAnimatorEnabled) { }
 
     bool m_scrollAnimatorEnabled;
 };
 
 } // namespace
 
 static void reset(ScrollAnimator& scrollAnimator)
 {
     scrollAnimator.scrollToOffsetWithoutAnimation(FloatPoint());
 }
 
-TEST(ScrollAnimatorTest, MainThreadEnabled)
+TEST(ScrollAnimatorTest, Enabled)
 {
     OwnPtrWillBeRawPtr<MockScrollableArea> scrollableArea = MockScrollableArea::create(true);
     OwnPtrWillBeRawPtr<ScrollAnimator> scrollAnimator = adoptPtrWillBeNoop(new ScrollAnimator(scrollableArea.get(), 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, setScrollOffset(_, _)).Times(12);
     EXPECT_CALL(*scrollableArea, registerForAnimation()).Times(3);
-    EXPECT_CALL(*scrollableArea, scheduleAnimation()).Times(AtLeast(1)).WillRepeatedly(Return(true));
 
-    EXPECT_FALSE(scrollAnimator->hasAnimationThatRequiresService());
+    EXPECT_FALSE(scrollAnimator->hasRunningAnimation());
 
     ScrollResultOneDimensional result = scrollAnimator->userScroll(HorizontalScrollbar, ScrollByLine, 100, -1);
-    EXPECT_FALSE(scrollAnimator->hasAnimationThatRequiresService());
+    EXPECT_FALSE(scrollAnimator->hasRunningAnimation());
     EXPECT_FALSE(result.didScroll);
     EXPECT_FLOAT_EQ(-1.0f, result.unusedScrollDelta);
 
     result = scrollAnimator->userScroll(HorizontalScrollbar, ScrollByLine, 100, 1);
-    EXPECT_TRUE(scrollAnimator->hasAnimationThatRequiresService());
+    EXPECT_TRUE(scrollAnimator->hasRunningAnimation());
     EXPECT_TRUE(result.didScroll);
     EXPECT_FLOAT_EQ(0.0, result.unusedScrollDelta);
 
     gMockedTime += 0.05;
-    scrollAnimator->updateCompositorAnimations();
-    scrollAnimator->tickAnimation(getMockedTime());
+    scrollAnimator->serviceScrollAnimations();
 
     EXPECT_NE(100, scrollAnimator->currentPosition().x());
     EXPECT_NE(0, scrollAnimator->currentPosition().x());
     EXPECT_EQ(0, scrollAnimator->currentPosition().y());
     reset(*scrollAnimator);
 
     scrollAnimator->userScroll(HorizontalScrollbar, ScrollByPage, 100, 1);
-    EXPECT_TRUE(scrollAnimator->hasAnimationThatRequiresService());
+    EXPECT_TRUE(scrollAnimator->hasRunningAnimation());
 
     gMockedTime += 0.05;
-    scrollAnimator->updateCompositorAnimations();
-    scrollAnimator->tickAnimation(getMockedTime());
+    scrollAnimator->serviceScrollAnimations();
 
     EXPECT_NE(100, scrollAnimator->currentPosition().x());
     EXPECT_NE(0, scrollAnimator->currentPosition().x());
     EXPECT_EQ(0, scrollAnimator->currentPosition().y());
     reset(*scrollAnimator);
 
     scrollAnimator->userScroll(HorizontalScrollbar, ScrollByPixel, 4, 25);
-    EXPECT_TRUE(scrollAnimator->hasAnimationThatRequiresService());
+    EXPECT_TRUE(scrollAnimator->hasRunningAnimation());
 
     gMockedTime += 0.05;
-    scrollAnimator->updateCompositorAnimations();
-    scrollAnimator->tickAnimation(getMockedTime());
+    scrollAnimator->serviceScrollAnimations();
 
     EXPECT_NE(100, scrollAnimator->currentPosition().x());
     EXPECT_NE(0, scrollAnimator->currentPosition().x());
     EXPECT_EQ(0, scrollAnimator->currentPosition().y());
 
     gMockedTime += 1.0;
-    scrollAnimator->updateCompositorAnimations();
-    scrollAnimator->tickAnimation(getMockedTime());
+    scrollAnimator->serviceScrollAnimations();
 
-    EXPECT_FALSE(scrollAnimator->hasAnimationThatRequiresService());
+    EXPECT_FALSE(scrollAnimator->hasRunningAnimation());
     EXPECT_EQ(100, scrollAnimator->currentPosition().x());
 
     reset(*scrollAnimator);
 
     scrollAnimator->userScroll(HorizontalScrollbar, ScrollByPrecisePixel, 4, 25);
-    EXPECT_FALSE(scrollAnimator->hasAnimationThatRequiresService());
+    EXPECT_FALSE(scrollAnimator->hasRunningAnimation());
 
     EXPECT_EQ(100, scrollAnimator->currentPosition().x());
     EXPECT_NE(0, scrollAnimator->currentPosition().x());
     EXPECT_EQ(0, scrollAnimator->currentPosition().y());
     reset(*scrollAnimator);
 }
 
 TEST(ScrollAnimatorTest, Disabled)
 {
     OwnPtrWillBeRawPtr<MockScrollableArea> scrollableArea = MockScrollableArea::create(false);
@@ skipping 19 matching lines @@
     EXPECT_EQ(0, scrollAnimator->currentPosition().y());
     reset(*scrollAnimator);
 
     scrollAnimator->userScroll(HorizontalScrollbar, ScrollByPixel, 100, 1);
     EXPECT_EQ(100, scrollAnimator->currentPosition().x());
     EXPECT_EQ(0, scrollAnimator->currentPosition().y());
     reset(*scrollAnimator);
 }
 
 } // namespace blink