cc: Chromify AnimationRegistrar

R=jamesr@chromium.org
BUG=none


Review URL: https://chromiumcodereview.appspot.com/12617016

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@189194 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 33 insertions, 27 deletions

diff --git a/cc/animation/animation_registrar.cc b/cc/animation/animation_registrar.cc
index 948a582..05f522c 100644
--- a/cc/animation/animation_registrar.cc
+++ b/cc/animation/animation_registrar.cc
@@ -8,44 +8,50 @@
 
 namespace cc {
 
-AnimationRegistrar::AnimationRegistrar() { }
-AnimationRegistrar::~AnimationRegistrar()
-{
-    AnimationControllerMap copy = all_animation_controllers_;
-    for (AnimationControllerMap::iterator iter = copy.begin(); iter != copy.end(); ++iter)
-        (*iter).second->SetAnimationRegistrar(NULL);
+AnimationRegistrar::AnimationRegistrar() {}
+
+AnimationRegistrar::~AnimationRegistrar() {
+  AnimationControllerMap copy = all_animation_controllers_;
+  for (AnimationControllerMap::iterator iter = copy.begin();
+       iter != copy.end();
+       ++iter)
+    (*iter).second->SetAnimationRegistrar(NULL);
 }
 
 scoped_refptr<LayerAnimationController>
-AnimationRegistrar::GetAnimationControllerForId(int id)
-{
-    scoped_refptr<LayerAnimationController> toReturn;
-    if (!ContainsKey(all_animation_controllers_, id)) {
-        toReturn = LayerAnimationController::Create(id);
-        toReturn->SetAnimationRegistrar(this);
-        all_animation_controllers_[id] = toReturn.get();
-    } else
-        toReturn = all_animation_controllers_[id];
-    return toReturn;
+AnimationRegistrar::GetAnimationControllerForId(int id) {
+  scoped_refptr<LayerAnimationController> to_return;
+  if (!ContainsKey(all_animation_controllers_, id)) {
+    to_return = LayerAnimationController::Create(id);
+    to_return->SetAnimationRegistrar(this);
+    all_animation_controllers_[id] = to_return.get();
+  } else {
+    to_return = all_animation_controllers_[id];
+  }
+  return to_return;
 }
 
-void AnimationRegistrar::DidActivateAnimationController(LayerAnimationController* controller) {
-    active_animation_controllers_[controller->id()] = controller;
+void AnimationRegistrar::DidActivateAnimationController(
+    LayerAnimationController* controller) {
+  active_animation_controllers_[controller->id()] = controller;
 }
 
-void AnimationRegistrar::DidDeactivateAnimationController(LayerAnimationController* controller) {
-    if (ContainsKey(active_animation_controllers_, controller->id()))
-        active_animation_controllers_.erase(controller->id());
+void AnimationRegistrar::DidDeactivateAnimationController(
+    LayerAnimationController* controller) {
+  if (ContainsKey(active_animation_controllers_, controller->id()))
+    active_animation_controllers_.erase(controller->id());
 }
 
-void AnimationRegistrar::RegisterAnimationController(LayerAnimationController* controller) {
-    all_animation_controllers_[controller->id()] = controller;
+void AnimationRegistrar::RegisterAnimationController(
+    LayerAnimationController* controller) {
+  all_animation_controllers_[controller->id()] = controller;
 }
 
-void AnimationRegistrar::UnregisterAnimationController(LayerAnimationController* controller) {
-    if (ContainsKey(all_animation_controllers_, controller->id()))
-        all_animation_controllers_.erase(controller->id());
-    DidDeactivateAnimationController(controller);
+void AnimationRegistrar::UnregisterAnimationController(
+    LayerAnimationController* controller) {
+  if (ContainsKey(all_animation_controllers_, controller->id()))
+    all_animation_controllers_.erase(controller->id());
+  DidDeactivateAnimationController(controller);
 }
 
 }  // namespace cc