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

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

Issue 2750293003: Delete unused AnimatableValue code (Closed)
Patch Set: Fix unit tests Created 3 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
Index: third_party/WebKit/Source/core/animation/CompositorAnimationsTest.cpp
diff --git a/third_party/WebKit/Source/core/animation/CompositorAnimationsTest.cpp b/third_party/WebKit/Source/core/animation/CompositorAnimationsTest.cpp
index 2fe7ce24d183774c044177798fbe0db4cbccb732..5cc354ea185965c68aba38080b859dd2a56ad7ad 100644
--- a/third_party/WebKit/Source/core/animation/CompositorAnimationsTest.cpp
+++ b/third_party/WebKit/Source/core/animation/CompositorAnimationsTest.cpp
@@ -38,7 +38,6 @@
#include "core/animation/animatable/AnimatableDouble.h"
#include "core/animation/animatable/AnimatableFilterOperations.h"
#include "core/animation/animatable/AnimatableTransform.h"
-#include "core/animation/animatable/AnimatableValueTestHelper.h"
#include "core/dom/Document.h"
#include "core/layout/LayoutObject.h"
#include "core/paint/ObjectPaintProperties.h"
@@ -368,32 +367,6 @@ TEST_F(AnimationCompositorAnimationsTest,
duplicateSingleKeyframeAndTestIsCandidateOnResult(badKeyframe2.get()));
}
-TEST_F(
- AnimationCompositorAnimationsTest,
- isCandidateForAnimationOnCompositorKeyframeEffectModelMultipleFramesOkay) {
- AnimatableValueKeyframeVector framesSame;
- framesSame.push_back(createDefaultKeyframe(CSSPropertyOpacity,
- EffectModel::CompositeReplace, 0.0)
- .get());
- framesSame.push_back(createDefaultKeyframe(CSSPropertyOpacity,
- EffectModel::CompositeReplace, 1.0)
- .get());
- EXPECT_TRUE(isCandidateForAnimationOnCompositor(
- m_timing, *AnimatableValueKeyframeEffectModel::create(framesSame)));
-
- AnimatableValueKeyframeVector framesMixed;
- framesMixed.push_back(createDefaultKeyframe(CSSPropertyOpacity,
- EffectModel::CompositeReplace,
- 0.0)
- .get());
- framesMixed.push_back(createDefaultKeyframe(CSSPropertyTransform,
- EffectModel::CompositeReplace,
- 1.0)
- .get());
- EXPECT_FALSE(isCandidateForAnimationOnCompositor(
- m_timing, *AnimatableValueKeyframeEffectModel::create(framesMixed)));
-}
-
TEST_F(AnimationCompositorAnimationsTest,
isCandidateForAnimationOnCompositorKeyframeEffectModel) {
AnimatableValueKeyframeVector framesSame;
@@ -407,14 +380,16 @@ TEST_F(AnimationCompositorAnimationsTest,
m_timing, *AnimatableValueKeyframeEffectModel::create(framesSame)));
AnimatableValueKeyframeVector framesMixedProperties;
- framesMixedProperties.push_back(
- createDefaultKeyframe(CSSPropertyOpacity, EffectModel::CompositeReplace,
- 0.0)
- .get());
- framesMixedProperties.push_back(
- createDefaultKeyframe(CSSPropertyColor, EffectModel::CompositeReplace,
- 1.0)
- .get());
+ RefPtr<AnimatableValueKeyframe> keyframe = AnimatableValueKeyframe::create();
+ keyframe->setOffset(0);
+ keyframe->setPropertyValue(CSSPropertyColor, AnimatableDouble::create(0));
+ keyframe->setPropertyValue(CSSPropertyOpacity, AnimatableDouble::create(0));
+ framesMixedProperties.push_back(keyframe.release());
+ keyframe = AnimatableValueKeyframe::create();
+ keyframe->setOffset(1);
+ keyframe->setPropertyValue(CSSPropertyColor, AnimatableDouble::create(1));
+ keyframe->setPropertyValue(CSSPropertyOpacity, AnimatableDouble::create(1));
+ framesMixedProperties.push_back(keyframe.release());
EXPECT_FALSE(isCandidateForAnimationOnCompositor(
m_timing,
*AnimatableValueKeyframeEffectModel::create(framesMixedProperties)));

Powered by Google App Engine
This is Rietveld 408576698