cc: Misc animation refactoring

Make animation code conform to the style guide by using auto where
appropriate, renaming functions named incorrectly, etc. Avoid
accessing layer_animation_controller directly where possible.

Review URL: https://codereview.chromium.org/948243003

Cr-Commit-Position: refs/heads/master@{#318195}

cc/blink/web_layer_impl.cc

@@ -256,7 +256,7 @@ void WebLayerImpl::removeAnimation(int animation_id) {
 void WebLayerImpl::removeAnimation(
     int animation_id,
     blink::WebCompositorAnimation::TargetProperty target_property) {
-  layer_->layer_animation_controller()->RemoveAnimation(
+  layer_->RemoveAnimation(
       animation_id, static_cast<Animation::TargetProperty>(target_property));
 }
 

cc/layers/layer.cc

@@ -1204,6 +1204,12 @@ void Layer::RemoveAnimation(int animation_id) {
   SetNeedsCommit();
 }
 
+void Layer::RemoveAnimation(int animation_id,
+                            Animation::TargetProperty property) {
+  layer_animation_controller_->RemoveAnimation(animation_id, property);
+  SetNeedsCommit();
+}
+
 void Layer::SetLayerAnimationControllerForTest(
     scoped_refptr<LayerAnimationController> controller) {
   layer_animation_controller_->RemoveValueObserver(this);

cc/layers/layer.h

@@ -410,6 +410,7 @@ class CC_EXPORT Layer : public base::RefCounted<Layer>,
   bool AddAnimation(scoped_ptr<Animation> animation);
   void PauseAnimation(int animation_id, double time_offset);
   void RemoveAnimation(int animation_id);
+  void RemoveAnimation(int animation_id, Animation::TargetProperty property);
 
   LayerAnimationController* layer_animation_controller() {
     return layer_animation_controller_.get();

cc/layers/layer_impl.cc

@@ -83,7 +83,7 @@ LayerImpl::LayerImpl(LayerTreeImpl* tree_impl,
   DCHECK_GT(layer_id_, 0);
   DCHECK(layer_tree_impl_);
   layer_tree_impl_->RegisterLayer(this);
-  AnimationRegistrar* registrar = layer_tree_impl_->animationRegistrar();
+  AnimationRegistrar* registrar = layer_tree_impl_->GetAnimationRegistrar();
   layer_animation_controller_ =
       registrar->GetAnimationControllerForId(layer_id_);
   layer_animation_controller_->AddValueObserver(this);

cc/test/layer_tree_test.cc

@@ -349,10 +349,9 @@ class LayerTreeHostImplForTesting : public LayerTreeHostImpl {
   void UpdateAnimationState(bool start_ready_animations) override {
     LayerTreeHostImpl::UpdateAnimationState(start_ready_animations);
     bool has_unfinished_animation = false;
-    AnimationRegistrar::AnimationControllerMap::const_iterator iter =
-        active_animation_controllers().begin();
-    for (; iter != active_animation_controllers().end(); ++iter) {
-      if (iter->second->HasActiveAnimation()) {
+    for (const auto& it :
+         animation_registrar()->active_animation_controllers()) {
+      if (it.second->HasActiveAnimation()) {
         has_unfinished_animation = true;
         break;
       }

cc/trees/layer_tree_host.cc

@@ -558,8 +558,7 @@ void LayerTreeHost::SetAnimationEvents(
     // controllers may still receive events for impl-only animations.
     const AnimationRegistrar::AnimationControllerMap& animation_controllers =
         animation_registrar_->all_animation_controllers();
-    AnimationRegistrar::AnimationControllerMap::const_iterator iter =
-        animation_controllers.find(event_layer_id);
+    auto iter = animation_controllers.find(event_layer_id);
     if (iter != animation_controllers.end()) {
       switch ((*events)[event_index].type) {
         case AnimationEvent::STARTED:
@@ -1194,14 +1193,12 @@ void LayerTreeHost::AnimateLayers(base::TimeTicks monotonic_time) {
 
   TRACE_EVENT0("cc", "LayerTreeHost::AnimateLayers");
 
-  AnimationRegistrar::AnimationControllerMap copy =
+  AnimationRegistrar::AnimationControllerMap active_controllers_copy =
       animation_registrar_->active_animation_controllers();
-  for (AnimationRegistrar::AnimationControllerMap::iterator iter = copy.begin();
-       iter != copy.end();
-       ++iter) {
-    (*iter).second->Animate(monotonic_time);
+  for (auto& it : active_controllers_copy) {
+    it.second->Animate(monotonic_time);
     bool start_ready_animations = true;
-    (*iter).second->UpdateState(start_ready_animations, NULL);
+    it.second->UpdateState(start_ready_animations, NULL);
   }
 }
 

cc/trees/layer_tree_host_impl.cc

@@ -3134,31 +3134,26 @@ void LayerTreeHostImpl::AnimateLayers(base::TimeTicks monotonic_time) {
     return;
 
   TRACE_EVENT0("cc", "LayerTreeHostImpl::AnimateLayers");
-  AnimationRegistrar::AnimationControllerMap copy =
+  AnimationRegistrar::AnimationControllerMap controllers_copy =
       animation_registrar_->active_animation_controllers();
-  for (AnimationRegistrar::AnimationControllerMap::iterator iter = copy.begin();
-       iter != copy.end();
-       ++iter)
-    (*iter).second->Animate(monotonic_time);
+  for (auto& it : controllers_copy)
+    it.second->Animate(monotonic_time);
 
   SetNeedsAnimate();
 }
 
 void LayerTreeHostImpl::UpdateAnimationState(bool start_ready_animations) {
-  if (!settings_.accelerated_animation_enabled ||
-      !needs_animate_layers() ||
+  if (!settings_.accelerated_animation_enabled || !needs_animate_layers() ||
       !active_tree_->root_layer())
     return;
 
   TRACE_EVENT0("cc", "LayerTreeHostImpl::UpdateAnimationState");
   scoped_ptr<AnimationEventsVector> events =
       make_scoped_ptr(new AnimationEventsVector);
-  AnimationRegistrar::AnimationControllerMap copy =
+  AnimationRegistrar::AnimationControllerMap active_controllers_copy =
       animation_registrar_->active_animation_controllers();
-  for (AnimationRegistrar::AnimationControllerMap::iterator iter = copy.begin();
-       iter != copy.end();
-       ++iter)
-    (*iter).second->UpdateState(start_ready_animations, events.get());
+  for (auto& it : active_controllers_copy)
+    it.second->UpdateState(start_ready_animations, events.get());
 
   if (!events->empty()) {
     client_->PostAnimationEventsToMainThreadOnImplThread(events.Pass());
@@ -3173,12 +3168,10 @@ void LayerTreeHostImpl::ActivateAnimations() {
     return;
 
   TRACE_EVENT0("cc", "LayerTreeHostImpl::ActivateAnimations");
-  AnimationRegistrar::AnimationControllerMap copy =
+  AnimationRegistrar::AnimationControllerMap active_controllers_copy =
       animation_registrar_->active_animation_controllers();
-  for (AnimationRegistrar::AnimationControllerMap::iterator iter = copy.begin();
-       iter != copy.end();
-       ++iter)
-    (*iter).second->ActivateAnimations();
+  for (auto& it : active_controllers_copy)
+    it.second->ActivateAnimations();
 
   SetNeedsAnimate();
 }

cc/trees/layer_tree_host_impl.h

@@ -535,10 +535,6 @@ class CC_EXPORT LayerTreeHostImpl
 
   // Virtual for testing.
   virtual void AnimateLayers(base::TimeTicks monotonic_time);
-  const AnimationRegistrar::AnimationControllerMap&
-      active_animation_controllers() const {
-    return animation_registrar_->active_animation_controllers();
-  }
 
   LayerTreeHostImplClient* client_;
   Proxy* proxy_;

cc/trees/layer_tree_host_unittest_animation.cc

@@ -195,8 +195,9 @@ class LayerTreeHostAnimationTestAnimationsGetDeleted
 
   void AnimateLayers(LayerTreeHostImpl* host_impl,
                      base::TimeTicks monotonic_time) override {
-    bool have_animations = !host_impl->animation_registrar()->
-        active_animation_controllers().empty();
+    bool have_animations = !host_impl->animation_registrar()
+                                ->active_animation_controllers()
+                                .empty();
     if (!started_animating_ && have_animations) {
       started_animating_ = true;
       return;
@@ -1241,21 +1242,18 @@ class LayerTreeHostAnimationTestAddAnimationAfterAnimating
     // After both animations have started, verify that they have valid
     // start times.
     num_swap_buffers_++;
-    AnimationRegistrar::AnimationControllerMap copy =
+    AnimationRegistrar::AnimationControllerMap controllers_copy =
         host_impl->animation_registrar()->active_animation_controllers();
-    if (copy.size() == 2u) {
+    if (controllers_copy.size() == 2u) {
       EndTest();
       EXPECT_GE(num_swap_buffers_, 3);
-      for (AnimationRegistrar::AnimationControllerMap::iterator iter =
-               copy.begin();
-           iter != copy.end();
-           ++iter) {
-        int id = ((*iter).second->id());
+      for (auto& it : controllers_copy) {
+        int id = it.first;
         if (id == host_impl->RootLayer()->id()) {
-          Animation* anim = (*iter).second->GetAnimation(Animation::TRANSFORM);
+          Animation* anim = it.second->GetAnimation(Animation::TRANSFORM);
           EXPECT_GT((anim->start_time() - base::TimeTicks()).InSecondsF(), 0);
         } else if (id == host_impl->RootLayer()->children()[0]->id()) {
-          Animation* anim = (*iter).second->GetAnimation(Animation::OPACITY);
+          Animation* anim = it.second->GetAnimation(Animation::OPACITY);
           EXPECT_GT((anim->start_time() - base::TimeTicks()).InSecondsF(), 0);
         }
       }

cc/trees/layer_tree_impl.cc

@@ -984,7 +984,7 @@ void LayerTreeImpl::SetNeedsRedraw() {
   layer_tree_host_impl_->SetNeedsRedraw();
 }
 
-AnimationRegistrar* LayerTreeImpl::animationRegistrar() const {
+AnimationRegistrar* LayerTreeImpl::GetAnimationRegistrar() const {
   return layer_tree_host_impl_->animation_registrar();
 }
 

cc/trees/layer_tree_impl.h

@@ -239,7 +239,7 @@ class CC_EXPORT LayerTreeImpl {
 
   size_t NumLayers();
 
-  AnimationRegistrar* animationRegistrar() const;
+  AnimationRegistrar* GetAnimationRegistrar() const;
 
   void PushPersistedState(LayerTreeImpl* pending_tree);