Purge impl-only animations awaiting deletion in AnimationPlayer::UpdateState.

cc/animation/element_animations_unittest.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/animation/element_animations.h"
 
 #include "base/memory/ptr_util.h"
 #include "cc/animation/animation_delegate.h"
 #include "cc/animation/animation_events.h"
 #include "cc/animation/animation_host.h"
@@ skipping 909 matching lines @@
   // Calling UpdateState after Animate should promote the animation to running
   // state.
   player_impl_->Tick(kInitialTickTime);
   player_impl_->UpdateState(true, events.get());
   EXPECT_EQ(
       Animation::RUNNING,
       player_impl_->GetAnimation(TargetProperty::SCROLL_OFFSET)->run_state());
 
   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(),
                                    gfx::ScrollOffset(100.f, 200.f),
                                    gfx::ScrollOffset(100.f, 100.f), true);
 
   // Calling UpdateState without Animate should NOT promote the animation to
   // running state.
   player_impl_->UpdateState(true, events.get());
   EXPECT_EQ(
@@ skipping 1062 matching lines @@
   player_impl_->Tick(kInitialTickTime);
   player_impl_->UpdateState(true, events.get());
   EXPECT_TRUE(delegate_impl.finished());
   EXPECT_TRUE(host_impl_->needs_push_properties());
   EXPECT_EQ(1u, events->events_.size());
   EXPECT_EQ(AnimationEvent::TAKEOVER, events->events_[0].type);
   EXPECT_EQ(123, events->events_[0].animation_start_time);
   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]);
   EXPECT_TRUE(delegate.takeover());
 
   // AnimationPlayer::NotifyAnimationTakeover requests SetNeedsPushProperties
   // to purge CT animations marked for deletion.
   EXPECT_TRUE(player_->needs_push_properties());
 
   // ElementAnimations::PurgeAnimationsMarkedForDeletion call happens only in
@@ skipping 1559 matching lines @@
   DestroyTestMainLayer();
   EXPECT_EQ(0u, host_->ticking_players_for_testing().size());
 
   PushProperties();
   EXPECT_EQ(0u, host_->ticking_players_for_testing().size());
   EXPECT_EQ(0u, host_impl_->ticking_players_for_testing().size());
 }
 
 }  // namespace
 }  // namespace cc