Imported WebKit commit 76dac539db7ece7079963adfcfe878d8e2f7d861 (http://svn.webkit.org/repository/webkit/trunk@135696)

New snapshot that fixes build after QMacStyle removal

Change-Id: Idea95c96c73b49158d52861db2a4b8d2c51766b0
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>

1 files changed, 0 insertions, 24 deletions

diff --git a/Source/WebKit/chromium/tests/ScrollAnimatorNoneTest.cpp b/Source/WebKit/chromium/tests/ScrollAnimatorNoneTest.cpp
index 83088a312..35ad63c46 100644
--- a/Source/WebKit/chromium/tests/ScrollAnimatorNoneTest.cpp
+++ b/Source/WebKit/chromium/tests/ScrollAnimatorNoneTest.cpp
@@ -146,30 +146,6 @@ TEST(ScrollAnimatorEnabled, Enabled)
     scrollAnimatorNone.reset();
 }
 
-TEST(ScrollAnimatorEnabled, flingScrollEncoding)
-{
-    MockScrollableArea scrollableArea(true);
-    MockScrollAnimatorNone scrollAnimatorNone(&scrollableArea);
-
-    scrollAnimatorNone.reset();
-
-    scrollAnimatorNone.scroll(HorizontalScrollbar, ScrollByPixelVelocity, 111, -42);
-    scrollAnimatorNone.scroll(VerticalScrollbar, ScrollByPixelVelocity, 222, 42);
-    EXPECT_EQ(-42, scrollAnimatorNone.m_fp.x());
-    EXPECT_EQ(42, scrollAnimatorNone.m_fp.y());
-    EXPECT_EQ(1, scrollAnimatorNone.m_count);
-    scrollAnimatorNone.reset();
-
-    scrollAnimatorNone.scroll(VerticalScrollbar, ScrollByPixelVelocity, 222, 42);
-    scrollAnimatorNone.scroll(HorizontalScrollbar, ScrollByPixelVelocity, 111, -42);
-    EXPECT_EQ(-42, scrollAnimatorNone.m_fp.x());
-    EXPECT_EQ(42, scrollAnimatorNone.m_fp.y());
-    EXPECT_EQ(1, scrollAnimatorNone.m_count);
-    scrollAnimatorNone.reset();
-}
-
-
-
 TEST(ScrollAnimatorEnabled, Disabled)
 {
     MockScrollableArea scrollableArea(false);