Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / core / animation / TimingInputTest.cpp

diff --git a/src/third_party/WebKit/Source/core/animation/TimingInputTest.cpp b/src/third_party/WebKit/Source/core/animation/TimingInputTest.cpp
index aa0e9c5..55f599a 100644 (file)
--- a/src/third_party/WebKit/Source/core/animation/TimingInputTest.cpp
+++ b/src/third_party/WebKit/Source/core/animation/TimingInputTest.cpp
@@ -45,9 +45,9 @@ private:
 
 TEST_F(AnimationTimingInputTest, TimingInputStartDelay)
 {
-    EXPECT_EQ(1.1, applyTimingInputNumber("delay", 1.1).startDelay);
-    EXPECT_EQ(-1, applyTimingInputNumber("delay", -1).startDelay);
-    EXPECT_EQ(1, applyTimingInputString("delay", "1").startDelay);
+    EXPECT_EQ(1.1, applyTimingInputNumber("delay", 1100).startDelay);
+    EXPECT_EQ(-1, applyTimingInputNumber("delay", -1000).startDelay);
+    EXPECT_EQ(1, applyTimingInputString("delay", "1000").startDelay);
     EXPECT_EQ(0, applyTimingInputString("delay", "1s").startDelay);
     EXPECT_EQ(0, applyTimingInputString("delay", "Infinity").startDelay);
     EXPECT_EQ(0, applyTimingInputString("delay", "-Infinity").startDelay);
@@ -57,8 +57,8 @@ TEST_F(AnimationTimingInputTest, TimingInputStartDelay)
 
 TEST_F(AnimationTimingInputTest, TimingInputEndDelay)
 {
-    EXPECT_EQ(10, applyTimingInputNumber("endDelay", 10).endDelay);
-    EXPECT_EQ(-2.5, applyTimingInputNumber("endDelay", -2.5).endDelay);
+    EXPECT_EQ(10, applyTimingInputNumber("endDelay", 10000).endDelay);
+    EXPECT_EQ(-2.5, applyTimingInputNumber("endDelay", -2500).endDelay);
 }
 
 TEST_F(AnimationTimingInputTest, TimingInputFillMode)
@@ -101,9 +101,9 @@ TEST_F(AnimationTimingInputTest, TimingInputIterationCount)
 
 TEST_F(AnimationTimingInputTest, TimingInputIterationDuration)
 {
-    EXPECT_EQ(1.1, applyTimingInputNumber("duration", 1.1).iterationDuration);
-    EXPECT_TRUE(std::isnan(applyTimingInputNumber("duration", -1).iterationDuration));
-    EXPECT_EQ(1, applyTimingInputString("duration", "1").iterationDuration);
+    EXPECT_EQ(1.1, applyTimingInputNumber("duration", 1100).iterationDuration);
+    EXPECT_TRUE(std::isnan(applyTimingInputNumber("duration", -1000).iterationDuration));
+    EXPECT_EQ(1, applyTimingInputString("duration", "1000").iterationDuration);
 
     Timing timing = applyTimingInputString("duration", "Infinity");
     EXPECT_TRUE(std::isinf(timing.iterationDuration));
@@ -139,13 +139,13 @@ TEST_F(AnimationTimingInputTest, TimingInputDirection)
 
 TEST_F(AnimationTimingInputTest, TimingInputTimingFunction)
 {
-    const RefPtr<TimingFunction> defaultTimingFunction = LinearTimingFunction::preset();
+    const RefPtr<TimingFunction> defaultTimingFunction = LinearTimingFunction::shared();
 
     EXPECT_EQ(*CubicBezierTimingFunction::preset(CubicBezierTimingFunction::Ease), *applyTimingInputString("easing", "ease").timingFunction);
     EXPECT_EQ(*CubicBezierTimingFunction::preset(CubicBezierTimingFunction::EaseIn), *applyTimingInputString("easing", "ease-in").timingFunction);
     EXPECT_EQ(*CubicBezierTimingFunction::preset(CubicBezierTimingFunction::EaseOut), *applyTimingInputString("easing", "ease-out").timingFunction);
     EXPECT_EQ(*CubicBezierTimingFunction::preset(CubicBezierTimingFunction::EaseInOut), *applyTimingInputString("easing", "ease-in-out").timingFunction);
-    EXPECT_EQ(*LinearTimingFunction::preset(), *applyTimingInputString("easing", "linear").timingFunction);
+    EXPECT_EQ(*LinearTimingFunction::shared(), *applyTimingInputString("easing", "linear").timingFunction);
     EXPECT_EQ(*StepsTimingFunction::preset(StepsTimingFunction::Start), *applyTimingInputString("easing", "step-start").timingFunction);
     EXPECT_EQ(*StepsTimingFunction::preset(StepsTimingFunction::Middle), *applyTimingInputString("easing", "step-middle").timingFunction);
     EXPECT_EQ(*StepsTimingFunction::preset(StepsTimingFunction::End), *applyTimingInputString("easing", "step-end").timingFunction);