UI Compositor Animation: Remove cc::ElementAnimations state storage.

cc/animation/animation_host.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/animation_host.h"
 
 #include <algorithm>
 
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
@@ skipping 110 matching lines @@
 void AnimationHost::RegisterPlayerForElement(ElementId element_id,
                                              AnimationPlayer* player) {
   DCHECK(element_id);
   DCHECK(player);
 
   scoped_refptr<ElementAnimations> element_animations =
       GetElementAnimationsForElementId(element_id);
   if (!element_animations) {
     element_animations = ElementAnimations::Create();
     element_animations->SetElementId(element_id);
-    RegisterElementAnimations(element_animations.get());
+    element_to_animations_map_[element_animations->element_id()] =
+        element_animations;
   }
 
   if (element_animations->animation_host() != this) {
     element_animations->SetAnimationHost(this);
     element_animations->InitAffectedElementTypes();
   }
 
   element_animations->AddPlayer(player);
 }
 
 void AnimationHost::UnregisterPlayerForElement(ElementId element_id,
                                                AnimationPlayer* player) {
   DCHECK(element_id);
   DCHECK(player);
 
   scoped_refptr<ElementAnimations> element_animations =
       GetElementAnimationsForElementId(element_id);
   DCHECK(element_animations);
   element_animations->RemovePlayer(player);
 
   if (element_animations->IsEmpty()) {
     element_animations->ClearAffectedElementTypes();
-    UnregisterElementAnimations(element_animations.get());
+    element_to_animations_map_.erase(element_animations->element_id());
+    DidDeactivateElementAnimations(element_animations.get());
     element_animations->SetAnimationHost(nullptr);
   }
 }
 
 void AnimationHost::SetMutatorHostClient(MutatorHostClient* client) {
   if (mutator_host_client_ == client)
     return;
 
   mutator_host_client_ = client;
 
@@ skipping 390 matching lines @@
   active_element_to_animations_map_[element_animations->element_id()] =
       element_animations;
 }
 
 void AnimationHost::DidDeactivateElementAnimations(
     ElementAnimations* element_animations) {
   DCHECK(element_animations->element_id());
   active_element_to_animations_map_.erase(element_animations->element_id());
 }
 
-void AnimationHost::RegisterElementAnimations(
-    ElementAnimations* element_animations) {
-  DCHECK(element_animations->element_id());
-  element_to_animations_map_[element_animations->element_id()] =
-      element_animations;
-}
-
-void AnimationHost::UnregisterElementAnimations(
-    ElementAnimations* element_animations) {
-  DCHECK(element_animations->element_id());
-  element_to_animations_map_.erase(element_animations->element_id());
-  DidDeactivateElementAnimations(element_animations);
-}
-
 const AnimationHost::ElementToAnimationsMap&
 AnimationHost::active_element_animations_for_testing() const {
   return active_element_to_animations_map_;
 }
 
 const AnimationHost::ElementToAnimationsMap&
 AnimationHost::all_element_animations_for_testing() const {
   return element_to_animations_map_;
 }
 
 }  // namespace cc