CC Animation: Erase AnimationRegistrar

cc/animation/layer_animation_controller.cc

 // Copyright 2012 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/layer_animation_controller.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <vector>
 
 #include "cc/animation/animation.h"
 #include "cc/animation/animation_curve.h"
 #include "cc/animation/animation_delegate.h"
 #include "cc/animation/animation_events.h"
-#include "cc/animation/animation_registrar.h"
+#include "cc/animation/animation_host.h"
 #include "cc/animation/keyframed_animation_curve.h"
 #include "cc/animation/layer_animation_value_observer.h"
 #include "cc/animation/layer_animation_value_provider.h"
 #include "cc/animation/scroll_offset_animation_curve.h"
 #include "cc/output/filter_operations.h"
 #include "ui/gfx/geometry/box_f.h"
 #include "ui/gfx/transform.h"
 
 namespace cc {
 
 LayerAnimationController::LayerAnimationController(int id)
-    : registrar_(0),
+    : host_(0),
       id_(id),
       is_active_(false),
       value_provider_(nullptr),
       layer_animation_delegate_(nullptr),
       needs_to_start_animations_(false),
       scroll_offset_animation_was_interrupted_(false),
       potentially_animating_transform_for_active_observers_(false),
       potentially_animating_transform_for_pending_observers_(false) {}
 
 LayerAnimationController::~LayerAnimationController() {
-  if (registrar_)
-    registrar_->UnregisterAnimationController(this);
+  if (host_)
+    host_->UnregisterAnimationController(this);
 }
 
 scoped_refptr<LayerAnimationController> LayerAnimationController::Create(
     int id) {
   return make_scoped_refptr(new LayerAnimationController(id));
 }
 
 void LayerAnimationController::PauseAnimation(int animation_id,
                                               base::TimeDelta time_offset) {
   for (size_t i = 0; i < animations_.size(); ++i) {
@@ skipping 312 matching lines @@
       if ((observer_type == ObserverType::ACTIVE &&
            animations_[i]->affects_active_observers()) ||
           (observer_type == ObserverType::PENDING &&
            animations_[i]->affects_pending_observers()))
         return true;
     }
   }
   return false;
 }
 
-void LayerAnimationController::SetAnimationRegistrar(
-    AnimationRegistrar* registrar) {
-  if (registrar_ == registrar)
+void LayerAnimationController::SetAnimationHost(AnimationHost* host) {
+  if (host_ == host)
     return;
 
-  if (registrar_)
-    registrar_->UnregisterAnimationController(this);
+  if (host_)
+    host_->UnregisterAnimationController(this);
 
-  registrar_ = registrar;
-  if (registrar_)
-    registrar_->RegisterAnimationController(this);
+  host_ = host;
+  if (host_)
+    host_->RegisterAnimationController(this);
 
   UpdateActivation(FORCE_ACTIVATION);
 }
 
 void LayerAnimationController::NotifyAnimationStarted(
     const AnimationEvent& event) {
   if (event.is_impl_only) {
     FOR_EACH_OBSERVER(LayerAnimationEventObserver, event_observers_,
                       OnAnimationStarted(event));
     if (layer_animation_delegate_)
@@ skipping 761 matching lines @@
               animations_[i]->affects_pending_observers());
           break;
         }
       }
     }
   }
 }
 
 void LayerAnimationController::UpdateActivation(UpdateActivationType type) {
   bool force = type == FORCE_ACTIVATION;
-  if (registrar_) {
+  if (host_) {
     bool was_active = is_active_;
     is_active_ = false;
     for (size_t i = 0; i < animations_.size(); ++i) {
       if (animations_[i]->run_state() != Animation::WAITING_FOR_DELETION) {
         is_active_ = true;
         break;
       }
     }
 
     if (is_active_ && (!was_active || force))
-      registrar_->DidActivateAnimationController(this);
+      host_->DidActivateAnimationController(this);
     else if (!is_active_ && (was_active || force))
-      registrar_->DidDeactivateAnimationController(this);
+      host_->DidDeactivateAnimationController(this);
   }
 }
 
 void LayerAnimationController::NotifyObserversOpacityAnimated(
     float opacity,
     bool notify_active_observers,
     bool notify_pending_observers) {
   if (value_observers_.might_have_observers()) {
     base::ObserverListBase<LayerAnimationValueObserver>::Iterator it(
         &value_observers_);
@@ skipping 98 matching lines @@
         &value_observers_);
     LayerAnimationValueObserver* obs;
     while ((obs = it.GetNext()) != nullptr)
       if (obs->IsActive())
         return true;
   }
   return false;
 }
 
 }  // namespace cc