Merge 92639 - Scroll animator changes to nail the framerate

Source/WebKit/chromium/tests/ScrollAnimatorNoneTest.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 61 matching lines @@
     MockScrollAnimatorNone()
         : ScrollAnimatorNone(new MockScrollableArea(true)) { }
     MockScrollAnimatorNone(ScrollableArea* scrollableArea)
         : ScrollAnimatorNone(scrollableArea) { }
 
     float currentX() { return m_currentPosX; }
     float currentY() { return m_currentPosY; }
 
     void reset()
     {
-        stopAnimationTimerIfNeeded(&m_horizontalData);
-        stopAnimationTimerIfNeeded(&m_verticalData);
+        stopAnimationTimerIfNeeded();
         m_currentPosX = 0;
         m_currentPosY = 0;
         m_horizontalData.reset();
         m_verticalData.reset();
     }
 
     MOCK_METHOD1(scrollToOffsetWithoutAnimation, void(const FloatPoint&));
 };
 
 TEST(ScrollAnimatorEnabled, Enabled)
 {
     MockScrollableArea scrollableArea(true);
-    MockScrollAnimatorNone scrollAnimatorChromium(&scrollableArea);
+    MockScrollAnimatorNone scrollAnimatorNone(&scrollableArea);
 
     EXPECT_CALL(scrollableArea, scrollSize(_)).Times(AtLeast(1)).WillRepeatedly(Return(1000));
-    EXPECT_CALL(scrollableArea, setScrollOffset(_)).Times(AtLeast(1));
+    EXPECT_CALL(scrollableArea, setScrollOffset(_)).Times(3);
 
-    scrollAnimatorChromium.scroll(HorizontalScrollbar, ScrollByLine, 100, 1);
-    EXPECT_NE(100, scrollAnimatorChromium.currentX());
-    EXPECT_NE(0, scrollAnimatorChromium.currentX());
-    EXPECT_EQ(0, scrollAnimatorChromium.currentY());
-    scrollAnimatorChromium.reset();
+    scrollAnimatorNone.scroll(HorizontalScrollbar, ScrollByLine, 100, 1);
+    EXPECT_NE(100, scrollAnimatorNone.currentX());
+    EXPECT_NE(0, scrollAnimatorNone.currentX());
+    EXPECT_EQ(0, scrollAnimatorNone.currentY());
+    scrollAnimatorNone.reset();
 
-    scrollAnimatorChromium.scroll(HorizontalScrollbar, ScrollByPage, 100, 1);
-    EXPECT_NE(100, scrollAnimatorChromium.currentX());
-    EXPECT_NE(0, scrollAnimatorChromium.currentX());
-    EXPECT_EQ(0, scrollAnimatorChromium.currentY());
-    scrollAnimatorChromium.reset();
+    scrollAnimatorNone.scroll(HorizontalScrollbar, ScrollByPage, 100, 1);
+    EXPECT_NE(100, scrollAnimatorNone.currentX());
+    EXPECT_NE(0, scrollAnimatorNone.currentX());
+    EXPECT_EQ(0, scrollAnimatorNone.currentY());
+    scrollAnimatorNone.reset();
 
-    scrollAnimatorChromium.scroll(HorizontalScrollbar, ScrollByPixel, 4, 25);
-    EXPECT_NE(100, scrollAnimatorChromium.currentX());
-    EXPECT_NE(0, scrollAnimatorChromium.currentX());
-    EXPECT_EQ(0, scrollAnimatorChromium.currentY());
-    scrollAnimatorChromium.reset();
+    scrollAnimatorNone.scroll(HorizontalScrollbar, ScrollByPixel, 4, 25);
+    EXPECT_NE(100, scrollAnimatorNone.currentX());
+    EXPECT_NE(0, scrollAnimatorNone.currentX());
+    EXPECT_EQ(0, scrollAnimatorNone.currentY());
+    scrollAnimatorNone.reset();
 }
 
 TEST(ScrollAnimatorEnabled, Disabled)
 {
     MockScrollableArea scrollableArea(false);
-    MockScrollAnimatorNone scrollAnimatorChromium(&scrollableArea);
+    MockScrollAnimatorNone scrollAnimatorNone(&scrollableArea);
 
     EXPECT_CALL(scrollableArea, scrollSize(_)).Times(AtLeast(1)).WillRepeatedly(Return(1000));
-    EXPECT_CALL(scrollableArea, setScrollOffset(_)).Times(AtLeast(1));
+    EXPECT_CALL(scrollableArea, setScrollOffset(_)).Times(4);
 
-    scrollAnimatorChromium.scroll(HorizontalScrollbar, ScrollByLine, 100, 1);
-    EXPECT_EQ(100, scrollAnimatorChromium.currentX());
-    EXPECT_EQ(0, scrollAnimatorChromium.currentY());
-    scrollAnimatorChromium.reset();
+    scrollAnimatorNone.scroll(HorizontalScrollbar, ScrollByLine, 100, 1);
+    EXPECT_EQ(100, scrollAnimatorNone.currentX());
+    EXPECT_EQ(0, scrollAnimatorNone.currentY());
+    scrollAnimatorNone.reset();
 
-    scrollAnimatorChromium.scroll(HorizontalScrollbar, ScrollByPage, 100, 1);
-    EXPECT_EQ(100, scrollAnimatorChromium.currentX());
-    EXPECT_EQ(0, scrollAnimatorChromium.currentY());
-    scrollAnimatorChromium.reset();
+    scrollAnimatorNone.scroll(HorizontalScrollbar, ScrollByPage, 100, 1);
+    EXPECT_EQ(100, scrollAnimatorNone.currentX());
+    EXPECT_EQ(0, scrollAnimatorNone.currentY());
+    scrollAnimatorNone.reset();
 
-    scrollAnimatorChromium.scroll(HorizontalScrollbar, ScrollByDocument, 100, 1);
-    EXPECT_EQ(100, scrollAnimatorChromium.currentX());
-    EXPECT_EQ(0, scrollAnimatorChromium.currentY());
-    scrollAnimatorChromium.reset();
+    scrollAnimatorNone.scroll(HorizontalScrollbar, ScrollByDocument, 100, 1);
+    EXPECT_EQ(100, scrollAnimatorNone.currentX());
+    EXPECT_EQ(0, scrollAnimatorNone.currentY());
+    scrollAnimatorNone.reset();
 
-    scrollAnimatorChromium.scroll(HorizontalScrollbar, ScrollByPixel, 100, 1);
-    EXPECT_EQ(100, scrollAnimatorChromium.currentX());
-    EXPECT_EQ(0, scrollAnimatorChromium.currentY());
-    scrollAnimatorChromium.reset();
+    scrollAnimatorNone.scroll(HorizontalScrollbar, ScrollByPixel, 100, 1);
+    EXPECT_EQ(100, scrollAnimatorNone.currentX());
+    EXPECT_EQ(0, scrollAnimatorNone.currentY());
+    scrollAnimatorNone.reset();
 }
 
 class ScrollAnimatorNoneTest : public testing::Test {
 public:
     ScrollAnimatorNoneTest()
     {
     }
 
     virtual void SetUp()
     {
@@ skipping 545 matching lines @@
     }
     checkDesiredPosition(0);
 
     t += kAnimationTime;
     for (; result && t < kEndTime; t += kAnimationTime)
         result = result && animateScroll(t);
     checkSoftLanding(0);
 }
 
 #endif // ENABLE(SMOOTH_SCROLLING)