| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "core/animation/KeyframeEffect.h" | 5 #include "core/animation/KeyframeEffect.h" |
| 6 | 6 |
| 7 #include "bindings/core/v8/Dictionary.h" | 7 #include "bindings/core/v8/Dictionary.h" |
| 8 #include "bindings/core/v8/EffectModelOrDictionarySequenceOrDictionary.h" | 8 #include "bindings/core/v8/DictionarySequenceOrDictionary.h" |
| 9 #include "bindings/core/v8/V8BindingForTesting.h" | 9 #include "bindings/core/v8/V8BindingForTesting.h" |
| 10 #include "bindings/core/v8/V8KeyframeEffectOptions.h" | 10 #include "bindings/core/v8/V8KeyframeEffectOptions.h" |
| 11 #include "core/animation/AnimationClock.h" | 11 #include "core/animation/AnimationClock.h" |
| 12 #include "core/animation/AnimationEffectTiming.h" | 12 #include "core/animation/AnimationEffectTiming.h" |
| 13 #include "core/animation/AnimationTestHelper.h" | 13 #include "core/animation/AnimationTestHelper.h" |
| 14 #include "core/animation/DocumentTimeline.h" | 14 #include "core/animation/DocumentTimeline.h" |
| 15 #include "core/animation/KeyframeEffectModel.h" | 15 #include "core/animation/KeyframeEffectModel.h" |
| 16 #include "core/animation/Timing.h" | 16 #include "core/animation/Timing.h" |
| 17 #include "core/dom/Document.h" | 17 #include "core/dom/Document.h" |
| 18 #include "core/testing/DummyPageHolder.h" | 18 #include "core/testing/DummyPageHolder.h" |
| (...skipping 20 matching lines...) Expand all Loading... |
| 39 std::unique_ptr<DummyPageHolder> pageHolder; | 39 std::unique_ptr<DummyPageHolder> pageHolder; |
| 40 Persistent<Element> element; | 40 Persistent<Element> element; |
| 41 TrackExceptionState exceptionState; | 41 TrackExceptionState exceptionState; |
| 42 }; | 42 }; |
| 43 | 43 |
| 44 class AnimationKeyframeEffectV8Test : public KeyframeEffectTest { | 44 class AnimationKeyframeEffectV8Test : public KeyframeEffectTest { |
| 45 protected: | 45 protected: |
| 46 template<typename T> | 46 template<typename T> |
| 47 static KeyframeEffect* createAnimation(Element* element, Vector<Dictionary>
keyframeDictionaryVector, T timingInput, ExceptionState& exceptionState) | 47 static KeyframeEffect* createAnimation(Element* element, Vector<Dictionary>
keyframeDictionaryVector, T timingInput, ExceptionState& exceptionState) |
| 48 { | 48 { |
| 49 return KeyframeEffect::create(nullptr, element, EffectModelOrDictionaryS
equenceOrDictionary::fromDictionarySequence(keyframeDictionaryVector), timingInp
ut, exceptionState); | 49 return KeyframeEffect::create(nullptr, element, DictionarySequenceOrDict
ionary::fromDictionarySequence(keyframeDictionaryVector), timingInput, exception
State); |
| 50 } | 50 } |
| 51 static KeyframeEffect* createAnimation(Element* element, Vector<Dictionary>
keyframeDictionaryVector, ExceptionState& exceptionState) | 51 static KeyframeEffect* createAnimation(Element* element, Vector<Dictionary>
keyframeDictionaryVector, ExceptionState& exceptionState) |
| 52 { | 52 { |
| 53 return KeyframeEffect::create(nullptr, element, EffectModelOrDictionaryS
equenceOrDictionary::fromDictionarySequence(keyframeDictionaryVector), exception
State); | 53 return KeyframeEffect::create(nullptr, element, DictionarySequenceOrDict
ionary::fromDictionarySequence(keyframeDictionaryVector), exceptionState); |
| 54 } | 54 } |
| 55 }; | 55 }; |
| 56 | 56 |
| 57 TEST_F(AnimationKeyframeEffectV8Test, CanCreateAnAnimation) | 57 TEST_F(AnimationKeyframeEffectV8Test, CanCreateAnAnimation) |
| 58 { | 58 { |
| 59 V8TestingScope scope; | 59 V8TestingScope scope; |
| 60 Vector<Dictionary> jsKeyframes; | 60 Vector<Dictionary> jsKeyframes; |
| 61 v8::Local<v8::Object> keyframe1 = v8::Object::New(scope.isolate()); | 61 v8::Local<v8::Object> keyframe1 = v8::Object::New(scope.isolate()); |
| 62 v8::Local<v8::Object> keyframe2 = v8::Object::New(scope.isolate()); | 62 v8::Local<v8::Object> keyframe2 = v8::Object::New(scope.isolate()); |
| 63 | 63 |
| (...skipping 295 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 359 Timing timing; | 359 Timing timing; |
| 360 timing.iterationDuration = 5; | 360 timing.iterationDuration = 5; |
| 361 KeyframeEffect* animation = KeyframeEffect::create(element.get(), nullptr, t
iming); | 361 KeyframeEffect* animation = KeyframeEffect::create(element.get(), nullptr, t
iming); |
| 362 EXPECT_EQ(element.get(), animation->target()); | 362 EXPECT_EQ(element.get(), animation->target()); |
| 363 document().timeline().play(animation); | 363 document().timeline().play(animation); |
| 364 pageHolder.reset(); | 364 pageHolder.reset(); |
| 365 element.clear(); | 365 element.clear(); |
| 366 } | 366 } |
| 367 | 367 |
| 368 } // namespace blink | 368 } // namespace blink |
| OLD | NEW |