Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(83)

Unified Diff: third_party/WebKit/Source/core/animation/EffectInputTest.cpp

Issue 2234683002: Remove EffectModel IDL interface (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/core/animation/EffectInputTest.cpp
diff --git a/third_party/WebKit/Source/core/animation/EffectInputTest.cpp b/third_party/WebKit/Source/core/animation/EffectInputTest.cpp
index 32cf30f7d9349743cd4aa48b2196d1b04f9f3528..f8d63b5c96c3c81a7b315616d20173ef1589b38b 100644
--- a/third_party/WebKit/Source/core/animation/EffectInputTest.cpp
+++ b/third_party/WebKit/Source/core/animation/EffectInputTest.cpp
@@ -5,7 +5,7 @@
#include "core/animation/EffectInput.h"
#include "bindings/core/v8/Dictionary.h"
-#include "bindings/core/v8/EffectModelOrDictionarySequenceOrDictionary.h"
+#include "bindings/core/v8/DictionarySequenceOrDictionary.h"
#include "bindings/core/v8/V8BindingForTesting.h"
#include "core/animation/AnimationTestHelper.h"
#include "core/animation/KeyframeEffectModel.h"
@@ -42,7 +42,7 @@ TEST(AnimationEffectInputTest, SortedOffsets)
jsKeyframes.append(Dictionary(keyframe2, scope.isolate(), scope.getExceptionState()));
Element* element = appendElement(scope.document());
- EffectModel* animationEffect = EffectInput::convert(element, EffectModelOrDictionarySequenceOrDictionary::fromDictionarySequence(jsKeyframes), nullptr, scope.getExceptionState());
+ EffectModel* animationEffect = EffectInput::convert(element, DictionarySequenceOrDictionary::fromDictionarySequence(jsKeyframes), nullptr, scope.getExceptionState());
EXPECT_FALSE(scope.getExceptionState().hadException());
const KeyframeEffectModelBase& keyframeEffect = *toKeyframeEffectModelBase(animationEffect);
EXPECT_EQ(1.0, keyframeEffect.getFrames()[1]->offset());
@@ -64,7 +64,7 @@ TEST(AnimationEffectInputTest, UnsortedOffsets)
jsKeyframes.append(Dictionary(keyframe2, scope.isolate(), scope.getExceptionState()));
Element* element = appendElement(scope.document());
- EffectInput::convert(element, EffectModelOrDictionarySequenceOrDictionary::fromDictionarySequence(jsKeyframes), nullptr, scope.getExceptionState());
+ EffectInput::convert(element, DictionarySequenceOrDictionary::fromDictionarySequence(jsKeyframes), nullptr, scope.getExceptionState());
EXPECT_TRUE(scope.getExceptionState().hadException());
EXPECT_EQ(V8TypeError, scope.getExceptionState().code());
}
@@ -88,7 +88,7 @@ TEST(AnimationEffectInputTest, LooslySorted)
jsKeyframes.append(Dictionary(keyframe3, scope.isolate(), scope.getExceptionState()));
Element* element = appendElement(scope.document());
- EffectModel* animationEffect = EffectInput::convert(element, EffectModelOrDictionarySequenceOrDictionary::fromDictionarySequence(jsKeyframes), nullptr, scope.getExceptionState());
+ EffectModel* animationEffect = EffectInput::convert(element, DictionarySequenceOrDictionary::fromDictionarySequence(jsKeyframes), nullptr, scope.getExceptionState());
EXPECT_FALSE(scope.getExceptionState().hadException());
const KeyframeEffectModelBase& keyframeEffect = *toKeyframeEffectModelBase(animationEffect);
EXPECT_EQ(1, keyframeEffect.getFrames()[2]->offset());
@@ -117,7 +117,7 @@ TEST(AnimationEffectInputTest, OutOfOrderWithNullOffsets)
jsKeyframes.append(Dictionary(keyframe4, scope.isolate(), scope.getExceptionState()));
Element* element = appendElement(scope.document());
- EffectInput::convert(element, EffectModelOrDictionarySequenceOrDictionary::fromDictionarySequence(jsKeyframes), nullptr, scope.getExceptionState());
+ EffectInput::convert(element, DictionarySequenceOrDictionary::fromDictionarySequence(jsKeyframes), nullptr, scope.getExceptionState());
EXPECT_TRUE(scope.getExceptionState().hadException());
}
@@ -141,7 +141,7 @@ TEST(AnimationEffectInputTest, Invalid)
jsKeyframes.append(Dictionary(keyframe3, scope.isolate(), scope.getExceptionState()));
Element* element = appendElement(scope.document());
- EffectInput::convert(element, EffectModelOrDictionarySequenceOrDictionary::fromDictionarySequence(jsKeyframes), nullptr, scope.getExceptionState());
+ EffectInput::convert(element, DictionarySequenceOrDictionary::fromDictionarySequence(jsKeyframes), nullptr, scope.getExceptionState());
EXPECT_TRUE(scope.getExceptionState().hadException());
EXPECT_EQ(V8TypeError, scope.getExceptionState().code());
}
« no previous file with comments | « third_party/WebKit/Source/core/animation/EffectInput.cpp ('k') | third_party/WebKit/Source/core/animation/EffectModel.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698