CC Animation: Remove Observers and Observations in namings.

cc/animation/element_animations.h

 // 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.
 
 #ifndef CC_ANIMATION_ELEMENT_ANIMATIONS_H_
 #define CC_ANIMATION_ELEMENT_ANIMATIONS_H_
 
 #include <bitset>
 #include <memory>
 #include <vector>
@@ skipping 33 matching lines @@
   static scoped_refptr<ElementAnimations> Create();
 
   int layer_id() const { return layer_id_; }
   void SetLayerId(int layer_id);
 
   // Parent AnimationHost.
   AnimationHost* animation_host() { return animation_host_; }
   const AnimationHost* animation_host() const { return animation_host_; }
   void SetAnimationHost(AnimationHost* host);
 
-  void InitValueObservations();
-  void ClearValueObservations();
+  void InitAffectedElementTypes();
+  void ClearAffectedElementTypes();
 
   void LayerRegistered(int layer_id, LayerTreeType tree_type);
   void LayerUnregistered(int layer_id, LayerTreeType tree_type);
 
   void AddPlayer(AnimationPlayer* player);
   void RemovePlayer(AnimationPlayer* player);
   bool IsEmpty() const;
 
   typedef base::LinkedList<AnimationPlayer> PlayersList;
   typedef base::LinkNode<AnimationPlayer> PlayersListNode;
@@ skipping 11 matching lines @@
   void AbortAnimation(int animation_id);
   void AbortAnimations(TargetProperty::Type target_property,
                        bool needs_completion = false);
 
   void Animate(base::TimeTicks monotonic_time);
   void AccumulatePropertyUpdates(base::TimeTicks monotonic_time,
                                  AnimationEvents* events);
 
   void UpdateState(bool start_ready_animations, AnimationEvents* events);
 
-  // Make animations affect active observers if and only if they affect
-  // pending observers. Any animations that no longer affect any observers
+  // Make animations affect active elements if and only if they affect
+  // pending elements. Any animations that no longer affect any elements
   // are deleted.
   void ActivateAnimations();
 
   // Returns the active animation animating the given property that is either
   // running, or is next to run, if such an animation exists.
   Animation* GetAnimation(TargetProperty::Type target_property) const;
 
   // Returns the active animation for the given unique animation id.
   Animation* GetAnimationById(int animation_id) const;
 
   // Returns true if there are any animations that have neither finished nor
   // aborted.
   bool HasActiveAnimation() const;
 
   // Returns true if there are any animations at all to process.
   bool has_any_animation() const { return !animations_.empty(); }
 
   // Returns true if there is an animation that is either currently animating
   // the given property or scheduled to animate this property in the future, and
-  // that affects the given observer type.
+  // that affects the given tree type.
   bool IsPotentiallyAnimatingProperty(TargetProperty::Type target_property,
-                                      LayerTreeType observer_type) const;
+                                      LayerTreeType tree_type) const;
 
   // Returns true if there is an animation that is currently animating the given
-  // property and that affects the given observer type.
+  // property and that affects the given tree type.
   bool IsCurrentlyAnimatingProperty(TargetProperty::Type target_property,
-                                    LayerTreeType observer_type) const;
+                                    LayerTreeType tree_type) const;
 
   void NotifyAnimationStarted(const AnimationEvent& event);
   void NotifyAnimationFinished(const AnimationEvent& event);
   void NotifyAnimationAborted(const AnimationEvent& event);
   void NotifyAnimationPropertyUpdate(const AnimationEvent& event);
   void NotifyAnimationTakeover(const AnimationEvent& event);
 
-  bool needs_active_value_observations() const {
-    return needs_active_value_observations_;
+  bool has_element_in_active_list() const {
+    return has_element_in_active_list_;
   }
-  bool needs_pending_value_observations() const {
-    return needs_pending_value_observations_;
+  bool has_element_in_pending_list() const {
+    return has_element_in_pending_list_;
   }
 
-  void set_needs_active_value_observations(
-      bool needs_active_value_observations) {
-    needs_active_value_observations_ = needs_active_value_observations;
+  void set_has_element_in_active_list(bool has_element_in_active_list) {
+    has_element_in_active_list_ = has_element_in_active_list;
   }
-  void set_needs_pending_value_observations(
-      bool needs_pending_value_observations) {
-    needs_pending_value_observations_ = needs_pending_value_observations;
+  void set_has_element_in_pending_list(bool has_element_in_pending_list) {
+    has_element_in_pending_list_ = has_element_in_pending_list;
   }
 
   bool HasFilterAnimationThatInflatesBounds() const;
   bool HasTransformAnimationThatInflatesBounds() const;
   bool HasAnimationThatInflatesBounds() const {
     return HasTransformAnimationThatInflatesBounds() ||
            HasFilterAnimationThatInflatesBounds();
   }
 
   bool FilterAnimationBoundsForBox(const gfx::BoxF& box,
                                    gfx::BoxF* bounds) const;
   bool TransformAnimationBoundsForBox(const gfx::BoxF& box,
                                       gfx::BoxF* bounds) const;
 
   bool HasAnimationThatAffectsScale() const;
 
-  bool HasOnlyTranslationTransforms(LayerTreeType observer_type) const;
+  bool HasOnlyTranslationTransforms(LayerTreeType tree_type) const;
 
   bool AnimationsPreserveAxisAlignment() const;
 
   // Sets |start_scale| to the maximum of starting animation scale along any
   // dimension at any destination in active animations. Returns false if the
   // starting scale cannot be computed.
-  bool AnimationStartScale(LayerTreeType observer_type,
-                           float* start_scale) const;
+  bool AnimationStartScale(LayerTreeType tree_type, float* start_scale) const;
 
   // Sets |max_scale| to the maximum scale along any dimension at any
   // destination in active animations. Returns false if the maximum scale cannot
   // be computed.
-  bool MaximumTargetScale(LayerTreeType observer_type, float* max_scale) const;
+  bool MaximumTargetScale(LayerTreeType tree_type, float* max_scale) const;
 
   // When a scroll animation is removed on the main thread, its compositor
   // thread counterpart continues producing scroll deltas until activation.
   // These scroll deltas need to be cleared at activation, so that the active
   // layer's scroll offset matches the offset provided by the main thread
   // rather than a combination of this offset and scroll deltas produced by
   // the removed animation. This is to provide the illusion of synchronicity to
   // JS that simultaneously removes an animation and sets the scroll offset.
   bool scroll_offset_animation_was_interrupted() const {
     return scroll_offset_animation_was_interrupted_;
@@ skipping 27 matching lines @@
   void MarkFinishedAnimations(base::TimeTicks monotonic_time);
   void MarkAnimationsForDeletion(base::TimeTicks monotonic_time,
                                  AnimationEvents* events);
   void PurgeAnimationsMarkedForDeletion();
 
   void TickAnimations(base::TimeTicks monotonic_time);
 
   enum UpdateActivationType { NORMAL_ACTIVATION, FORCE_ACTIVATION };
   void UpdateActivation(UpdateActivationType type);
 
-  void NotifyObserversOpacityAnimated(float opacity,
-                                      bool notify_active_observers,
-                                      bool notify_pending_observers);
-  void NotifyObserversTransformAnimated(const gfx::Transform& transform,
-                                        bool notify_active_observers,
-                                        bool notify_pending_observers);
-  void NotifyObserversFilterAnimated(const FilterOperations& filter,
-                                     bool notify_active_observers,
-                                     bool notify_pending_observers);
-  void NotifyObserversScrollOffsetAnimated(
-      const gfx::ScrollOffset& scroll_offset,
-      bool notify_active_observers,
-      bool notify_pending_observers);
+  void NotifyClientOpacityAnimated(float opacity,
+                                   bool notify_active_elements,
+                                   bool notify_pending_elements);
+  void NotifyClientTransformAnimated(const gfx::Transform& transform,
+                                     bool notify_active_elements,
+                                     bool notify_pending_elements);
+  void NotifyClientFilterAnimated(const FilterOperations& filter,
+                                  bool notify_active_elements,
+                                  bool notify_pending_elements);
+  void NotifyClientScrollOffsetAnimated(const gfx::ScrollOffset& scroll_offset,
+                                        bool notify_active_elements,
+                                        bool notify_pending_elements);
 
-  void NotifyObserversAnimationWaitingForDeletion();
+  void NotifyClientAnimationWaitingForDeletion();
 
-  void NotifyObserversTransformIsPotentiallyAnimatingChanged(
-      bool notify_active_observers,
-      bool notify_pending_observers);
+  void NotifyClientTransformIsPotentiallyAnimatingChanged(
+      bool notify_active_elements,
+      bool notify_pending_elements);
 
   void UpdatePotentiallyAnimatingTransform();
 
   void OnFilterAnimated(LayerTreeType tree_type,
                         const FilterOperations& filters);
   void OnOpacityAnimated(LayerTreeType tree_type, float opacity);
   void OnTransformAnimated(LayerTreeType tree_type,
                            const gfx::Transform& transform);
   void OnScrollOffsetAnimated(LayerTreeType tree_type,
                               const gfx::ScrollOffset& scroll_offset);
@@ skipping 20 matching lines @@
   std::unique_ptr<PlayersList> players_list_;
   AnimationHost* animation_host_;
   int layer_id_;
   std::vector<std::unique_ptr<Animation>> animations_;
 
   // This is used to ensure that we don't spam the animation host.
   bool is_active_;
 
   base::TimeTicks last_tick_time_;
 
-  bool needs_active_value_observations_;
-  bool needs_pending_value_observations_;
+  bool has_element_in_active_list_;
+  bool has_element_in_pending_list_;
 
   // Only try to start animations when new animations are added or when the
   // previous attempt at starting animations failed to start all animations.
   bool needs_to_start_animations_;
 
   bool scroll_offset_animation_was_interrupted_;
 
-  bool potentially_animating_transform_for_active_observers_;
-  bool potentially_animating_transform_for_pending_observers_;
+  bool potentially_animating_transform_for_active_elements_;
+  bool potentially_animating_transform_for_pending_elements_;
 
   DISALLOW_COPY_AND_ASSIGN(ElementAnimations);
 };
 
 }  // namespace cc
 
 #endif  // CC_ANIMATION_ELEMENT_ANIMATIONS_H_