Imported WebKit commit 7e538425aa020340619e927792f3d895061fb54b (http://svn.webkit.org/repository/webkit/trunk@116286)

1 files changed, 11 insertions, 11 deletions

diff --git a/Source/WebKit/chromium/tests/ScrollAnimatorNoneTest.cpp b/Source/WebKit/chromium/tests/ScrollAnimatorNoneTest.cpp
index 9d21b8a9e..0827267ed 100644
--- a/Source/WebKit/chromium/tests/ScrollAnimatorNoneTest.cpp
+++ b/Source/WebKit/chromium/tests/ScrollAnimatorNoneTest.cpp
@@ -125,7 +125,7 @@ TEST(ScrollAnimatorEnabled, Enabled)
     scrollAnimatorNone.reset();
 
     scrollAnimatorNone.scroll(HorizontalScrollbar, ScrollByPixel, 4, 25);
-    EXPECT_NE(100, scrollAnimatorNone.currentX());
+    EXPECT_EQ(100, scrollAnimatorNone.currentX());
     EXPECT_NE(0, scrollAnimatorNone.currentX());
     EXPECT_EQ(0, scrollAnimatorNone.currentY());
     scrollAnimatorNone.reset();
@@ -692,21 +692,21 @@ TEST_F(ScrollAnimatorNoneTest, ScrollWheelTrace)
     ScrollAnimatorNone::Parameters parameters(true, 11 * kTickTime, 0, ScrollAnimatorNone::Cubic, 3 * kTickTime, ScrollAnimatorNone::Cubic, 3 * kTickTime, ScrollAnimatorNone::Linear, 0);
 
     // Constructed from an actual scroll wheel trace that exhibited a glitch.
-    bool result = updateDataFromParameters(1, 53.33, 1000, 100.5781, &parameters);
+    bool result = updateDataFromParameters(1, 53.33f, 1000, 100.5781f, &parameters);
     result = animateScroll(100.5933);
     result = result && animateScroll(100.6085);
-    result = result && updateDataFromParameters(1, 53.33, 1000, 100.6485, &parameters);
+    result = result && updateDataFromParameters(1, 53.33f, 1000, 100.6485f, &parameters);
     result = result && animateScroll(100.6515);
     result = result && animateScroll(100.6853);
-    result = result && updateDataFromParameters(1, 53.33, 1000, 100.6863, &parameters);
+    result = result && updateDataFromParameters(1, 53.33f, 1000, 100.6863f, &parameters);
     result = result && animateScroll(100.7005);
     result = result && animateScroll(100.7157);
     result = result && animateScroll(100.7312);
-    result = result && updateDataFromParameters(1, 53.33, 1000, 100.7379, &parameters);
+    result = result && updateDataFromParameters(1, 53.33f, 1000, 100.7379f, &parameters);
     result = result && animateScroll(100.7464);
     result = result && animateScroll(100.7617);
     result = result && animateScroll(100.7775);
-    result = result && updateDataFromParameters(1, 53.33, 1000, 100.7779, &parameters);
+    result = result && updateDataFromParameters(1, 53.33f, 1000, 100.7779f, &parameters);
     for (double t = 100.7928; result && t < 200; t += 0.015)
         result = result && animateScroll(t);
 }
@@ -716,21 +716,21 @@ TEST_F(ScrollAnimatorNoneTest, ScrollWheelTraceSmoothed)
     ScrollAnimatorNone::Parameters parameters(true, 11 * kTickTime, 7 * kTickTime, ScrollAnimatorNone::Cubic, 3 * kTickTime, ScrollAnimatorNone::Cubic, 3 * kTickTime, ScrollAnimatorNone::Linear, 0);
 
     // Constructed from an actual scroll wheel trace that exhibited a glitch.
-    bool result = updateDataFromParameters(1, 53.33, 1000, 100.5781, &parameters);
+    bool result = updateDataFromParameters(1, 53.33f, 1000, 100.5781f, &parameters);
     result = animateScroll(100.5933);
     result = result && animateScroll(100.6085);
-    result = result && updateDataFromParameters(1, 53.33, 1000, 100.6485, &parameters);
+    result = result && updateDataFromParameters(1, 53.33f, 1000, 100.6485f, &parameters);
     result = result && animateScroll(100.6515);
     result = result && animateScroll(100.6853);
-    result = result && updateDataFromParameters(1, 53.33, 1000, 100.6863, &parameters);
+    result = result && updateDataFromParameters(1, 53.33f, 1000, 100.6863f, &parameters);
     result = result && animateScroll(100.7005);
     result = result && animateScroll(100.7157);
     result = result && animateScroll(100.7312);
-    result = result && updateDataFromParameters(1, 53.33, 1000, 100.7379, &parameters);
+    result = result && updateDataFromParameters(1, 53.33f, 1000, 100.7379f, &parameters);
     result = result && animateScroll(100.7464);
     result = result && animateScroll(100.7617);
     result = result && animateScroll(100.7775);
-    result = result && updateDataFromParameters(1, 53.33, 1000, 100.7779, &parameters);
+    result = result && updateDataFromParameters(1, 53.33f, 1000, 100.7779f, &parameters);
     for (double t = 100.7928; result && t < 200; t += 0.015)
         result = result && animateScroll(t);
 }