Chromium Code Reviews| Index: third_party/WebKit/Source/core/animation/TimingInputTest.cpp |
| diff --git a/third_party/WebKit/Source/core/animation/TimingInputTest.cpp b/third_party/WebKit/Source/core/animation/TimingInputTest.cpp |
| index 1b3844fb9ecefa8ca6875c54614e27e1c93f64c1..2bab26f373353017e88ce709111fadfdd6104f56 100644 |
| --- a/third_party/WebKit/Source/core/animation/TimingInputTest.cpp |
| +++ b/third_party/WebKit/Source/core/animation/TimingInputTest.cpp |
| @@ -8,6 +8,7 @@ |
| #include "bindings/core/v8/V8KeyframeEffectOptions.h" |
| #include "core/animation/AnimationEffectTiming.h" |
| #include "core/animation/AnimationTestHelper.h" |
| +#include "core/testing/DummyPageHolder.h" |
|
alancutter (OOO until 2018)
2016/04/07 07:36:20
No need to add this if use counting isn't being te
|
| #include "testing/gtest/include/gtest/gtest.h" |
| #include <v8.h> |
| @@ -21,13 +22,27 @@ protected: |
| { |
| } |
| + void SetUp() override |
| + { |
| + pageHolder = DummyPageHolder::create(); |
| + document = &pageHolder->document(); |
| + } |
| + |
| + void TearDown() override |
| + { |
| + document.release(); |
| +#if ENABLE(OILPAN) |
| + Heap::collectAllGarbage(); |
| +#endif |
| + } |
| + |
| Timing applyTimingInputNumber(String timingProperty, double timingPropertyValue) |
| { |
| v8::Local<v8::Object> timingInput = v8::Object::New(m_isolate); |
| setV8ObjectPropertyAsNumber(m_isolate, timingInput, timingProperty, timingPropertyValue); |
| KeyframeEffectOptions timingInputDictionary; |
| V8KeyframeEffectOptions::toImpl(m_isolate, timingInput, timingInputDictionary, exceptionState); |
| - return TimingInput::convert(timingInputDictionary); |
| + return TimingInput::convert(timingInputDictionary, document); |
| } |
| Timing applyTimingInputString(String timingProperty, String timingPropertyValue) |
| @@ -36,11 +51,18 @@ protected: |
| setV8ObjectPropertyAsString(m_isolate, timingInput, timingProperty, timingPropertyValue); |
| KeyframeEffectOptions timingInputDictionary; |
| V8KeyframeEffectOptions::toImpl(m_isolate, timingInput, timingInputDictionary, exceptionState); |
| - return TimingInput::convert(timingInputDictionary); |
| + return TimingInput::convert(timingInputDictionary, document); |
| + } |
| + |
| + Timing convert(const KeyframeEffectOptions& timingInput) |
| + { |
| + return TimingInput::convert(timingInput, document); |
| } |
| v8::Isolate* m_isolate; |
| TrackExceptionState exceptionState; |
| + OwnPtr<DummyPageHolder> pageHolder; |
| + Persistent<Document> document; |
| private: |
| V8TestingScope m_scope; |
| @@ -166,7 +188,7 @@ TEST_F(AnimationTimingInputTest, TimingInputTimingFunction) |
| TEST_F(AnimationTimingInputTest, TimingInputEmpty) |
| { |
| Timing controlTiming; |
| - Timing updatedTiming = TimingInput::convert(KeyframeEffectOptions()); |
| + Timing updatedTiming = convert(KeyframeEffectOptions()); |
| EXPECT_EQ(controlTiming.startDelay, updatedTiming.startDelay); |
| EXPECT_EQ(controlTiming.fillMode, updatedTiming.fillMode); |