CC Animations: Rewrite unit tests to work with AnimationPlayer.

cc/animation/element_animations.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 <stddef.h>
 
 #include <algorithm>
 
 #include "base/macros.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"
 #include "cc/animation/animation_player.h"
 #include "cc/animation/keyframed_animation_curve.h"
 #include "cc/output/filter_operations.h"
 #include "cc/trees/mutator_host_client.h"
 #include "ui/gfx/geometry/box_f.h"
 
 namespace cc {
 
 scoped_refptr<ElementAnimations> ElementAnimations::Create() {
@@ skipping 127 matching lines @@
 
   // Update impl client state.
   if (needs_update_impl_client_state_)
     element_animations_impl->UpdateClientAnimationState();
   needs_update_impl_client_state_ = false;
 
   element_animations_impl->UpdateActivation(ActivationType::NORMAL);
   UpdateActivation(ActivationType::NORMAL);
 }
 
-void ElementAnimations::AddAnimation(std::unique_ptr<Animation> animation) {
-  // TODO(loyso): Erase this. Rewrite element_animations_unittest to use
-  // AnimationPlayer::AddAnimation.
-
-  // Add animation to the first player.
-  DCHECK(players_list_->might_have_observers());
-  ElementAnimations::PlayersList::Iterator it(players_list_.get());
-  AnimationPlayer* player = it.GetNext();
-  DCHECK(player);
-  player->AddAnimation(std::move(animation));
-}
-
 void ElementAnimations::Animate(base::TimeTicks monotonic_time) {
   DCHECK(!monotonic_time.is_null());
   if (!has_element_in_active_list() && !has_element_in_pending_list())
     return;
 
   {
     // TODO(crbug.com/634916): Shouldn't manually iterate through the list if
     // base::ObserverList has a callback mechanism.
     ElementAnimations::PlayersList::Iterator it(players_list_.get());
     AnimationPlayer* player;
@@ skipping 364 matching lines @@
   ElementAnimations::PlayersList::Iterator it(players_list_.get());
   AnimationPlayer* player;
   while ((player = it.GetNext()) != nullptr) {
     if (player->has_any_animation())
       return true;
   }
 
   return false;
 }
 
+bool ElementAnimations::HasAnyAnimationTargetingProperty(
+    TargetProperty::Type property) const {
+  ElementAnimations::PlayersList::Iterator it(players_list_.get());
+  AnimationPlayer* player;
+  while ((player = it.GetNext()) != nullptr) {
+    if (player->GetAnimation(property))
+      return true;
+  }
+  return false;
+}
+
 bool ElementAnimations::IsPotentiallyAnimatingProperty(
     TargetProperty::Type target_property,
     ElementListType list_type) const {
   ElementAnimations::PlayersList::Iterator it(players_list_.get());
   AnimationPlayer* player;
   while ((player = it.GetNext()) != nullptr) {
     if (player->IsPotentiallyAnimatingProperty(target_property, list_type))
       return true;
   }
 
@@ skipping 10 matching lines @@
       return true;
   }
 
   return false;
 }
 
 void ElementAnimations::SetScrollOffsetAnimationWasInterrupted() {
   scroll_offset_animation_was_interrupted_ = true;
 }
 
-bool ElementAnimations::needs_to_start_animations_for_testing() const {
-  ElementAnimations::PlayersList::Iterator it(players_list_.get());
-  AnimationPlayer* player;
-  while ((player = it.GetNext()) != nullptr) {
-    if (player->needs_to_start_animations())
-      return true;
-  }
-
-  return false;
-}
-
-void ElementAnimations::PauseAnimation(int animation_id,
-                                       base::TimeDelta time_offset) {
-  ElementAnimations::PlayersList::Iterator it(players_list_.get());
-  AnimationPlayer* player;
-  while ((player = it.GetNext()) != nullptr)
-    player->PauseAnimation(animation_id, time_offset.InSecondsF());
-}
-
-void ElementAnimations::RemoveAnimation(int animation_id) {
-  ElementAnimations::PlayersList::Iterator it(players_list_.get());
-  AnimationPlayer* player;
-  while ((player = it.GetNext()) != nullptr)
-    player->RemoveAnimation(animation_id);
-}
-
-void ElementAnimations::AbortAnimation(int animation_id) {
-  ElementAnimations::PlayersList::Iterator it(players_list_.get());
-  AnimationPlayer* player;
-  while ((player = it.GetNext()) != nullptr)
-    player->AbortAnimation(animation_id);
-}
-
-void ElementAnimations::AbortAnimations(TargetProperty::Type target_property,
-                                        bool needs_completion) {
-  ElementAnimations::PlayersList::Iterator it(players_list_.get());
-  AnimationPlayer* player;
-  while ((player = it.GetNext()) != nullptr)
-    player->AbortAnimations(target_property, needs_completion);
-}
-
-Animation* ElementAnimations::GetAnimation(
-    TargetProperty::Type target_property) const {
-  ElementAnimations::PlayersList::Iterator it(players_list_.get());
-  AnimationPlayer* player;
-  while ((player = it.GetNext()) != nullptr) {
-    if (Animation* animation = player->GetAnimation(target_property))
-      return animation;
-  }
-  return nullptr;
-}
-
-Animation* ElementAnimations::GetAnimationById(int animation_id) const {
-  ElementAnimations::PlayersList::Iterator it(players_list_.get());
-  AnimationPlayer* player;
-  while ((player = it.GetNext()) != nullptr) {
-    if (Animation* animation = player->GetAnimationById(animation_id))
-      return animation;
-  }
-  return nullptr;
-}
-
 void ElementAnimations::OnFilterAnimated(ElementListType list_type,
                                          const FilterOperations& filters) {
   DCHECK(element_id());
   DCHECK(animation_host());
   DCHECK(animation_host()->mutator_host_client());
   animation_host()->mutator_host_client()->SetElementFilterMutated(
       element_id(), list_type, filters);
 }
 
 void ElementAnimations::OnOpacityAnimated(ElementListType list_type,
@@ skipping 28 matching lines @@
   if (animation_host()) {
     DCHECK(animation_host()->mutator_host_client());
     return animation_host()->mutator_host_client()->GetScrollOffsetForAnimation(
         element_id());
   }
 
   return gfx::ScrollOffset();
 }
 
 }  // namespace cc