Revert of Takeover MT initiated animations from the compositor

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 76 matching lines @@
         ScrollableArea::trace(visitor);
     }
 
 private:
     explicit MockScrollableArea(bool scrollAnimatorEnabled)
         : m_scrollAnimatorEnabled(scrollAnimatorEnabled) { }
 
     bool m_scrollAnimatorEnabled;
 };
 
-class TestScrollAnimator : public ScrollAnimator {
-public:
-    TestScrollAnimator(ScrollableArea* scrollableArea, WTF::TimeFunction timingFunction)
-        : ScrollAnimator(scrollableArea, timingFunction) {};
-    ~TestScrollAnimator() override {};
-
-    void setShouldSendToCompositor(bool send)
-    {
-        m_shouldSendToCompositor = send;
-    }
-
-    bool sendAnimationToCompositor() override
-    {
-        if (m_shouldSendToCompositor) {
-            m_runState = ScrollAnimatorCompositorCoordinator::RunState::RunningOnCompositor;
-            m_compositorAnimationId = 1;
-            return true;
-        }
-        return false;
-    }
-
-protected:
-    void abortAnimation() override {}
-
-private:
-    bool m_shouldSendToCompositor = false;
-};
-
 } // namespace
 
 static void reset(ScrollAnimator& scrollAnimator)
 {
     scrollAnimator.scrollToOffsetWithoutAnimation(FloatPoint());
 }
 
 // TODO(skobes): Add unit tests for composited scrolling paths.
 
 TEST(ScrollAnimatorTest, MainThreadStates)
@@ skipping 164 matching lines @@
     EXPECT_TRUE(result.didScroll);
     gMockedTime += 0.05;
     scrollAnimator->updateCompositorAnimations();
     EXPECT_FALSE(scrollAnimator->hasRunningAnimation());
     EXPECT_EQ(x + 100, scrollAnimator->currentPosition().x());
     EXPECT_EQ(0, scrollAnimator->currentPosition().y());
 
     reset(*scrollAnimator);
 }
 
-// Test that a smooth scroll offset animation running on the compositor is
-// completed on the main thread.
-TEST(ScrollAnimatorTest, AnimatedScrollTakeover)
-{
-    OwnPtrWillBeRawPtr<MockScrollableArea> scrollableArea =
-        MockScrollableArea::create(true);
-    OwnPtrWillBeRawPtr<TestScrollAnimator> scrollAnimator = adoptPtrWillBeNoop(
-        new TestScrollAnimator(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(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.
-    ScrollResult result = scrollAnimator->userScroll(ScrollByLine, FloatSize(100, 0));
-    EXPECT_TRUE(scrollAnimator->hasAnimationThatRequiresService());
-    EXPECT_TRUE(result.didScrollX);
-    EXPECT_FLOAT_EQ(0.0, result.unusedScrollDeltaX);
-    EXPECT_TRUE(scrollAnimator->hasRunningAnimation());
-
-    // Update compositor animation.
-    gMockedTime += 0.05;
-    scrollAnimator->setShouldSendToCompositor(true);
-    scrollAnimator->updateCompositorAnimations();
-    EXPECT_EQ(scrollAnimator->m_runState,
-        ScrollAnimatorCompositorCoordinator::RunState::RunningOnCompositor);
-
-    // Takeover.
-    scrollAnimator->takeoverCompositorAnimation();
-    EXPECT_EQ(scrollAnimator->m_runState,
-        ScrollAnimatorCompositorCoordinator::RunState::RunningOnCompositorButNeedsTakeover);
-
-    // Animation should now be running on the main thread.
-    scrollAnimator->setShouldSendToCompositor(false);
-    scrollAnimator->updateCompositorAnimations();
-    EXPECT_EQ(scrollAnimator->m_runState,
-        ScrollAnimatorCompositorCoordinator::RunState::RunningOnMainThread);
-    scrollAnimator->tickAnimation(getMockedTime());
-    EXPECT_NE(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);
     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(8);
     EXPECT_CALL(*scrollableArea, registerForAnimation()).Times(0);
 
@@ skipping 12 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