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

Unified Diff: Source/core/animation/AnimationStackTest.cpp

Issue 216603008: Revert "Web Animations: Introduce String based KeyframeEffectModel" (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 9 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
« no previous file with comments | « Source/core/animation/AnimatableValueKeyframe.cpp ('k') | Source/core/animation/AnimationTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/animation/AnimationStackTest.cpp
diff --git a/Source/core/animation/AnimationStackTest.cpp b/Source/core/animation/AnimationStackTest.cpp
index a7805b1cc18dd9dc97b0531346de790492471e46..8ef425a175bd6bb726a981bfb7c1707e0dd2740e 100644
--- a/Source/core/animation/AnimationStackTest.cpp
+++ b/Source/core/animation/AnimationStackTest.cpp
@@ -37,14 +37,14 @@ protected:
PassRefPtrWillBeRawPtr<AnimationEffect> makeAnimationEffect(CSSPropertyID id, PassRefPtrWillBeRawPtr<AnimatableValue> value)
{
- AnimatableValueKeyframeVector keyframes(2);
- keyframes[0] = AnimatableValueKeyframe::create();
+ KeyframeEffectModel::KeyframeVector keyframes(2);
+ keyframes[0] = Keyframe::create();
keyframes[0]->setOffset(0.0);
keyframes[0]->setPropertyValue(id, value.get());
- keyframes[1] = AnimatableValueKeyframe::create();
+ keyframes[1] = Keyframe::create();
keyframes[1]->setOffset(1.0);
keyframes[1]->setPropertyValue(id, value.get());
- return AnimatableValueKeyframeEffectModel::create(keyframes);
+ return KeyframeEffectModel::create(keyframes);
}
PassRefPtr<InertAnimation> makeInertAnimation(PassRefPtrWillBeRawPtr<AnimationEffect> effect)
@@ -63,7 +63,7 @@ protected:
AnimatableValue* interpolationValue(Interpolation* interpolation)
{
- return toLegacyStyleInterpolation(interpolation)->currentValue().get();
+ return toLegacyStyleInterpolation(interpolation)->currentValue();
}
RefPtr<Document> document;
« no previous file with comments | « Source/core/animation/AnimatableValueKeyframe.cpp ('k') | Source/core/animation/AnimationTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698