| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "core/animation/EffectStack.h" | 5 #include "core/animation/EffectStack.h" |
| 6 | 6 |
| 7 #include "core/animation/AnimationClock.h" | 7 #include "core/animation/AnimationClock.h" |
| 8 #include "core/animation/CompositorPendingAnimations.h" | 8 #include "core/animation/CompositorPendingAnimations.h" |
| 9 #include "core/animation/DocumentTimeline.h" | 9 #include "core/animation/DocumentTimeline.h" |
| 10 #include "core/animation/ElementAnimations.h" | 10 #include "core/animation/ElementAnimations.h" |
| (...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 168 TEST_F(AnimationEffectStackTest, ForwardsFillDiscarding) { | 168 TEST_F(AnimationEffectStackTest, ForwardsFillDiscarding) { |
| 169 play(makeKeyframeEffect( | 169 play(makeKeyframeEffect( |
| 170 makeEffectModel(CSSPropertyFontSize, AnimatableDouble::create(1))), | 170 makeEffectModel(CSSPropertyFontSize, AnimatableDouble::create(1))), |
| 171 2); | 171 2); |
| 172 play(makeKeyframeEffect( | 172 play(makeKeyframeEffect( |
| 173 makeEffectModel(CSSPropertyFontSize, AnimatableDouble::create(2))), | 173 makeEffectModel(CSSPropertyFontSize, AnimatableDouble::create(2))), |
| 174 6); | 174 6); |
| 175 play(makeKeyframeEffect( | 175 play(makeKeyframeEffect( |
| 176 makeEffectModel(CSSPropertyFontSize, AnimatableDouble::create(3))), | 176 makeEffectModel(CSSPropertyFontSize, AnimatableDouble::create(3))), |
| 177 4); | 177 4); |
| 178 document->compositorPendingAnimations().update(); | 178 document->compositorPendingAnimations().update( |
| 179 Optional<CompositorElementIdSet>()); |
| 179 ActiveInterpolationsMap interpolations; | 180 ActiveInterpolationsMap interpolations; |
| 180 | 181 |
| 181 updateTimeline(11); | 182 updateTimeline(11); |
| 182 ThreadState::current()->collectAllGarbage(); | 183 ThreadState::current()->collectAllGarbage(); |
| 183 interpolations = EffectStack::activeInterpolations( | 184 interpolations = EffectStack::activeInterpolations( |
| 184 &element->elementAnimations()->effectStack(), nullptr, nullptr, | 185 &element->elementAnimations()->effectStack(), nullptr, nullptr, |
| 185 KeyframeEffectReadOnly::DefaultPriority); | 186 KeyframeEffectReadOnly::DefaultPriority); |
| 186 EXPECT_EQ(1u, interpolations.size()); | 187 EXPECT_EQ(1u, interpolations.size()); |
| 187 EXPECT_TRUE(interpolationValue(interpolations, CSSPropertyFontSize) | 188 EXPECT_TRUE(interpolationValue(interpolations, CSSPropertyFontSize) |
| 188 ->equals(AnimatableDouble::create(3).get())); | 189 ->equals(AnimatableDouble::create(3).get())); |
| (...skipping 24 matching lines...) Expand all Loading... |
| 213 interpolations = EffectStack::activeInterpolations( | 214 interpolations = EffectStack::activeInterpolations( |
| 214 &element->elementAnimations()->effectStack(), nullptr, nullptr, | 215 &element->elementAnimations()->effectStack(), nullptr, nullptr, |
| 215 KeyframeEffectReadOnly::DefaultPriority); | 216 KeyframeEffectReadOnly::DefaultPriority); |
| 216 EXPECT_EQ(1u, interpolations.size()); | 217 EXPECT_EQ(1u, interpolations.size()); |
| 217 EXPECT_TRUE(interpolationValue(interpolations, CSSPropertyFontSize) | 218 EXPECT_TRUE(interpolationValue(interpolations, CSSPropertyFontSize) |
| 218 ->equals(AnimatableDouble::create(3).get())); | 219 ->equals(AnimatableDouble::create(3).get())); |
| 219 EXPECT_EQ(1u, sampledEffectCount()); | 220 EXPECT_EQ(1u, sampledEffectCount()); |
| 220 } | 221 } |
| 221 | 222 |
| 222 } // namespace blink | 223 } // namespace blink |
| OLD | NEW |