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

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

Issue 2775143002: Implement frames() timing function (Closed)
Patch Set: 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 5cc354ea185965c68aba38080b859dd2a56ad7ad..b4c71135254077f5fb8dd0d7490701efd6800ae8 100644
--- a/third_party/WebKit/Source/core/animation/CompositorAnimationsTest.cpp
+++ b/third_party/WebKit/Source/core/animation/CompositorAnimationsTest.cpp
@@ -66,6 +66,7 @@ class AnimationCompositorAnimationsTest : public ::testing::Test {
RefPtr<TimingFunction> m_cubicEaseTimingFunction;
RefPtr<TimingFunction> m_cubicCustomTimingFunction;
RefPtr<TimingFunction> m_stepTimingFunction;
+ RefPtr<TimingFunction> m_framesTimingFunction;
Timing m_timing;
CompositorAnimations::CompositorTiming m_compositorTiming;
@@ -86,6 +87,7 @@ class AnimationCompositorAnimationsTest : public ::testing::Test {
m_cubicCustomTimingFunction = CubicBezierTimingFunction::create(1, 2, 3, 4);
m_stepTimingFunction =
StepsTimingFunction::create(1, StepsTimingFunction::StepPosition::END);
+ m_framesTimingFunction = FramesTimingFunction::create(2);
m_timing = createCompositableTiming();
m_compositorTiming = CompositorAnimations::CompositorTiming();
@@ -605,6 +607,15 @@ TEST_F(AnimationCompositorAnimationsTest,
}
TEST_F(AnimationCompositorAnimationsTest,
+ isCandidateForAnimationOnCompositorTimingFunctionFrames) {
+ m_timing.timingFunction = m_framesTimingFunction;
+ EXPECT_TRUE(isCandidateForAnimationOnCompositor(m_timing,
+ *m_keyframeAnimationEffect2));
+ EXPECT_TRUE(isCandidateForAnimationOnCompositor(m_timing,
+ *m_keyframeAnimationEffect5));
+}
+
+TEST_F(AnimationCompositorAnimationsTest,
isCandidateForAnimationOnCompositorTimingFunctionChainedLinear) {
EXPECT_TRUE(isCandidateForAnimationOnCompositor(m_timing,
*m_keyframeAnimationEffect2));
@@ -674,23 +685,29 @@ TEST_F(AnimationCompositorAnimationsTest,
}
TEST_F(AnimationCompositorAnimationsTest,
- isCandidateForAnimationOnCompositorTimingFunctionWithStepOkay) {
+ isCandidateForAnimationOnCompositorTimingFunctionWithStepOrFrameOkay) {
(*m_keyframeVector2)[0]->setEasing(m_stepTimingFunction.get());
m_keyframeAnimationEffect2 =
AnimatableValueKeyframeEffectModel::create(*m_keyframeVector2);
EXPECT_TRUE(isCandidateForAnimationOnCompositor(m_timing,
*m_keyframeAnimationEffect2));
+ (*m_keyframeVector2)[0]->setEasing(m_framesTimingFunction.get());
+ m_keyframeAnimationEffect2 =
+ AnimatableValueKeyframeEffectModel::create(*m_keyframeVector2);
+ EXPECT_TRUE(isCandidateForAnimationOnCompositor(m_timing,
+ *m_keyframeAnimationEffect2));
+
(*m_keyframeVector5)[0]->setEasing(m_stepTimingFunction.get());
(*m_keyframeVector5)[1]->setEasing(m_linearTimingFunction.get());
(*m_keyframeVector5)[2]->setEasing(m_cubicEaseTimingFunction.get());
- (*m_keyframeVector5)[3]->setEasing(m_linearTimingFunction.get());
+ (*m_keyframeVector5)[3]->setEasing(m_framesTimingFunction.get());
m_keyframeAnimationEffect5 =
AnimatableValueKeyframeEffectModel::create(*m_keyframeVector5);
EXPECT_TRUE(isCandidateForAnimationOnCompositor(m_timing,
*m_keyframeAnimationEffect5));
- (*m_keyframeVector5)[0]->setEasing(m_linearTimingFunction.get());
+ (*m_keyframeVector5)[0]->setEasing(m_framesTimingFunction.get());
(*m_keyframeVector5)[1]->setEasing(m_stepTimingFunction.get());
(*m_keyframeVector5)[2]->setEasing(m_cubicEaseTimingFunction.get());
(*m_keyframeVector5)[3]->setEasing(m_linearTimingFunction.get());
@@ -700,7 +717,7 @@ TEST_F(AnimationCompositorAnimationsTest,
*m_keyframeAnimationEffect5));
(*m_keyframeVector5)[0]->setEasing(m_linearTimingFunction.get());
- (*m_keyframeVector5)[1]->setEasing(m_cubicEaseTimingFunction.get());
+ (*m_keyframeVector5)[1]->setEasing(m_framesTimingFunction.get());
(*m_keyframeVector5)[2]->setEasing(m_cubicEaseTimingFunction.get());
(*m_keyframeVector5)[3]->setEasing(m_stepTimingFunction.get());
m_keyframeAnimationEffect5 =

Powered by Google App Engine
This is Rietveld 408576698