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

Unified Diff: cc/animation/element_animations_unittest.cc

Issue 2757453003: Purge impl-only animations awaiting deletion in AnimationPlayer::UpdateState. (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
« no previous file with comments | « cc/animation/animation_player.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/animation/element_animations_unittest.cc
diff --git a/cc/animation/element_animations_unittest.cc b/cc/animation/element_animations_unittest.cc
index 60a99c2136155e614da263bb48ee187d8d3f4a75..c6cb2d27db408e64a77b2b091e2339cb76a0f9e0 100644
--- a/cc/animation/element_animations_unittest.cc
+++ b/cc/animation/element_animations_unittest.cc
@@ -927,9 +927,7 @@ TEST_F(ElementAnimationsTest, UpdateStateWithoutAnimate) {
player_impl_->Tick(kInitialTickTime + TimeDelta::FromMilliseconds(1500));
player_impl_->UpdateState(true, events.get());
- EXPECT_EQ(
- Animation::WAITING_FOR_DELETION,
- player_impl_->GetAnimation(TargetProperty::SCROLL_OFFSET)->run_state());
+ EXPECT_EQ(nullptr, player_impl_->GetAnimation(TargetProperty::SCROLL_OFFSET));
// Add second scroll offset animation.
AddScrollOffsetAnimationToPlayer(player_impl_.get(),
@@ -2012,9 +2010,7 @@ TEST_F(ElementAnimationsTest, ImplThreadTakeoverAnimationGetsDeleted) {
EXPECT_EQ(
target_value,
events->events_[0].curve->ToScrollOffsetAnimationCurve()->target_value());
- EXPECT_EQ(
- Animation::WAITING_FOR_DELETION,
- player_impl_->GetAnimation(TargetProperty::SCROLL_OFFSET)->run_state());
+ EXPECT_EQ(nullptr, player_impl_->GetAnimation(TargetProperty::SCROLL_OFFSET));
// MT receives the event to take over.
player_->NotifyAnimationTakeover(events->events_[0]);
« no previous file with comments | « cc/animation/animation_player.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698