Upstream version 10.39.225.0

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

diff --git a/src/third_party/WebKit/Source/core/animation/AnimationTest.cpp b/src/third_party/WebKit/Source/core/animation/AnimationTest.cpp
index e094c9d..7a24cdf 100644 (file)
--- a/src/third_party/WebKit/Source/core/animation/AnimationTest.cpp
+++ b/src/third_party/WebKit/Source/core/animation/AnimationTest.cpp
@@ -8,13 +8,13 @@
 #include "bindings/core/v8/Dictionary.h"
 #include "bindings/core/v8/Nullable.h"
 #include "core/animation/AnimationClock.h"
-#include "core/animation/AnimationHelpers.h"
 #include "core/animation/AnimationNodeTiming.h"
 #include "core/animation/AnimationTestHelper.h"
 #include "core/animation/AnimationTimeline.h"
 #include "core/animation/KeyframeEffectModel.h"
 #include "core/animation/Timing.h"
 #include "core/dom/Document.h"
+#include "core/testing/DummyPageHolder.h"
 #include <gtest/gtest.h>
 #include <v8.h>
 
@@ -23,14 +23,16 @@ namespace blink {
 class AnimationAnimationTest : public ::testing::Test {
 protected:
     AnimationAnimationTest()
-        : document(Document::create())
-        , element(document->createElement("foo", ASSERT_NO_EXCEPTION))
+        : pageHolder(DummyPageHolder::create())
+        , document(pageHolder->document())
+        , element(document.createElement("foo", ASSERT_NO_EXCEPTION))
     {
-        document->animationClock().resetTimeForTesting();
-        EXPECT_EQ(0, document->timeline().currentTime());
+        document.animationClock().resetTimeForTesting(document.timeline().zeroTime());
+        EXPECT_EQ(0, document.timeline().currentTime());
     }
 
-    RefPtrWillBePersistent<Document> document;
+    OwnPtr<DummyPageHolder> pageHolder;
+    Document& document;
     RefPtrWillBePersistent<Element> element;
     TrackExceptionState exceptionState;
 };
@@ -101,8 +103,8 @@ TEST_F(AnimationAnimationV8Test, CanCreateAnAnimation)
     EXPECT_EQ("100px", keyframe1Width->cssText());
     EXPECT_EQ("0px", keyframe2Width->cssText());
 
-    EXPECT_EQ(*(CubicBezierTimingFunction::preset(CubicBezierTimingFunction::EaseInOut)), *keyframes[0]->easing());
-    EXPECT_EQ(*(CubicBezierTimingFunction::create(1, 1, 0.3, 0.3).get()), *keyframes[1]->easing());
+    EXPECT_EQ(*(CubicBezierTimingFunction::preset(CubicBezierTimingFunction::EaseInOut)), keyframes[0]->easing());
+    EXPECT_EQ(*(CubicBezierTimingFunction::create(1, 1, 0.3, 0.3).get()), keyframes[1]->easing());
 }
 
 TEST_F(AnimationAnimationV8Test, CanSetDuration)
@@ -348,7 +350,7 @@ TEST_F(AnimationAnimationTest, TimeToEffectChange)
     timing.endDelay = 100;
     timing.fillMode = Timing::FillModeNone;
     RefPtrWillBeRawPtr<Animation> animation = Animation::create(0, nullptr, timing);
-    RefPtrWillBeRawPtr<AnimationPlayer> player = document->timeline().play(animation.get());
+    RefPtrWillBeRawPtr<AnimationPlayer> player = document.timeline().play(animation.get());
     double inf = std::numeric_limits<double>::infinity();
 
     EXPECT_EQ(100, animation->timeToForwardsEffectChange());
@@ -381,7 +383,7 @@ TEST_F(AnimationAnimationTest, TimeToEffectChangeWithPlaybackRate)
     timing.playbackRate = 2;
     timing.fillMode = Timing::FillModeNone;
     RefPtrWillBeRawPtr<Animation> animation = Animation::create(0, nullptr, timing);
-    RefPtrWillBeRawPtr<AnimationPlayer> player = document->timeline().play(animation.get());
+    RefPtrWillBeRawPtr<AnimationPlayer> player = document.timeline().play(animation.get());
     double inf = std::numeric_limits<double>::infinity();
 
     EXPECT_EQ(100, animation->timeToForwardsEffectChange());
@@ -414,7 +416,7 @@ TEST_F(AnimationAnimationTest, TimeToEffectChangeWithNegativePlaybackRate)
     timing.playbackRate = -2;
     timing.fillMode = Timing::FillModeNone;
     RefPtrWillBeRawPtr<Animation> animation = Animation::create(0, nullptr, timing);
-    RefPtrWillBeRawPtr<AnimationPlayer> player = document->timeline().play(animation.get());
+    RefPtrWillBeRawPtr<AnimationPlayer> player = document.timeline().play(animation.get());
     double inf = std::numeric_limits<double>::infinity();
 
     EXPECT_EQ(100, animation->timeToForwardsEffectChange());
@@ -445,8 +447,8 @@ TEST_F(AnimationAnimationTest, ElementDestructorClearsAnimationTarget)
     timing.iterationDuration = 5;
     RefPtrWillBeRawPtr<Animation> animation = Animation::create(element.get(), nullptr, timing);
     EXPECT_EQ(element.get(), animation->target());
-    document->timeline().play(animation.get());
-    document.clear();
+    document.timeline().play(animation.get());
+    pageHolder.clear();
     element.clear();
 #if !ENABLE(OILPAN)
     EXPECT_EQ(0, animation->target());