CC Animation: Use std::bitset to update animation state.

cc/test/animation_timelines_test_common.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_TEST_ANIMATION_TIMELINES_TEST_COMMON_H_
 #define CC_TEST_ANIMATION_TIMELINES_TEST_COMMON_H_
 
 #include <memory>
 #include <unordered_map>
 
 #include "cc/animation/animation.h"
 #include "cc/animation/animation_delegate.h"
 #include "cc/animation/animation_host.h"
 #include "cc/trees/mutator_host_client.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/geometry/scroll_offset.h"
 
 namespace cc {
 
 class TestLayer {
  public:
   static std::unique_ptr<TestLayer> Create();
+  ~TestLayer();
 
   void ClearMutatedProperties();
 
   int transform_x() const;
   int transform_y() const;
   float brightness() const;
 
   const gfx::Transform& transform() const { return transform_; }
   void set_transform(const gfx::Transform& transform) {
     transform_ = transform;
@@ skipping 11 matching lines @@
     filters_ = filters;
     mutated_properties_[TargetProperty::FILTER] = true;
   }
 
   gfx::ScrollOffset scroll_offset() const { return scroll_offset_; }
   void set_scroll_offset(const gfx::ScrollOffset& scroll_offset) {
     scroll_offset_ = scroll_offset;
     mutated_properties_[TargetProperty::SCROLL_OFFSET] = true;
   }
 
-  bool transform_is_currently_animating() const {
-    return transform_is_currently_animating_;
+  bool is_currently_animating(TargetProperty::Type property) const {
+    return is_currently_animating_[property];
   }
-  void set_transform_is_currently_animating(bool is_animating) {
-    transform_is_currently_animating_ = is_animating;
+  void set_is_currently_animating(TargetProperty::Type property,
+                                  bool is_animating) {
+    is_currently_animating_[property] = is_animating;
   }
 
-  bool has_potential_transform_animation() const {
-    return has_potential_transform_animation_;
+  bool has_potential_animation(TargetProperty::Type property) const {
+    return has_potential_animation_[property];
   }
-  void set_has_potential_transform_animation(bool is_animating) {
-    has_potential_transform_animation_ = is_animating;
-  }
-
-  bool opacity_is_currently_animating() const {
-    return opacity_is_currently_animating_;
-  }
-  void set_opacity_is_currently_animating(bool is_animating) {
-    opacity_is_currently_animating_ = is_animating;
-  }
-
-  bool has_potential_opacity_animation() const {
-    return has_potential_opacity_animation_;
-  }
-  void set_has_potential_opacity_animation(bool is_animating) {
-    has_potential_opacity_animation_ = is_animating;
-  }
-
-  bool filter_is_currently_animating() const {
-    return filter_is_currently_animating_;
-  }
-  void set_filter_is_currently_animating(bool is_animating) {
-    filter_is_currently_animating_ = is_animating;
-  }
-
-  bool has_potential_filter_animation() const {
-    return has_potential_filter_animation_;
-  }
-  void set_has_potential_filter_animation(bool is_animating) {
-    has_potential_filter_animation_ = is_animating;
+  void set_has_potential_animation(TargetProperty::Type property,
+                                   bool is_animating) {
+    has_potential_animation_[property] = is_animating;
   }
 
   bool is_property_mutated(TargetProperty::Type property) const {
     return mutated_properties_[property];
   }
 
  private:
   TestLayer();
 
   gfx::Transform transform_;
   float opacity_;
   FilterOperations filters_;
   gfx::ScrollOffset scroll_offset_;
-  bool has_potential_transform_animation_;
-  bool transform_is_currently_animating_;
-  bool has_potential_opacity_animation_;
-  bool opacity_is_currently_animating_;
-  bool has_potential_filter_animation_;
-  bool filter_is_currently_animating_;
 
-  bool mutated_properties_[TargetProperty::LAST_TARGET_PROPERTY + 1];
+  TargetProperties has_potential_animation_;
+  TargetProperties is_currently_animating_;
+  TargetProperties mutated_properties_;
 };
 
 class TestHostClient : public MutatorHostClient {
  public:
   explicit TestHostClient(ThreadInstance thread_instance);
   ~TestHostClient();
 
   void ClearMutatedProperties();
 
   bool IsElementInList(ElementId element_id,
@@ skipping 12 matching lines @@
 
   void SetElementTransformMutated(ElementId element_id,
                                   ElementListType list_type,
                                   const gfx::Transform& transform) override;
 
   void SetElementScrollOffsetMutated(
       ElementId element_id,
       ElementListType list_type,
       const gfx::ScrollOffset& scroll_offset) override;
 
-  void ElementTransformIsAnimatingChanged(ElementId element_id,
-                                          ElementListType list_type,
-                                          AnimationChangeType change_type,
-                                          bool is_animating) override;
-
-  void ElementOpacityIsAnimatingChanged(ElementId element_id,
-                                        ElementListType list_type,
-                                        AnimationChangeType change_type,
-                                        bool is_animating) override;
-
-  void ElementFilterIsAnimatingChanged(ElementId element_id,
-                                       ElementListType list_type,
-                                       AnimationChangeType change_type,
-                                       bool is_animating) override;
+  void ElementIsAnimatingChanged(ElementId element_id,
+                                 ElementListType list_type,
+                                 const PropertyAnimationState& mask,
+                                 const PropertyAnimationState& state) override;
 
   void ScrollOffsetAnimationFinished() override {}
 
   void SetScrollOffsetForAnimation(const gfx::ScrollOffset& scroll_offset);
   gfx::ScrollOffset GetScrollOffsetForAnimation(
       ElementId element_id) const override;
 
   bool mutators_need_commit() const { return mutators_need_commit_; }
   void set_mutators_need_commit(bool need) { mutators_need_commit_ = need; }
 
@@ skipping 142 matching lines @@
   scoped_refptr<AnimationTimeline> timeline_;
   scoped_refptr<AnimationPlayer> player_;
 
   scoped_refptr<AnimationTimeline> timeline_impl_;
   scoped_refptr<AnimationPlayer> player_impl_;
 };
 
 }  // namespace cc
 
 #endif  // CC_TEST_ANIMATION_TIMELINES_TEST_COMMON_H_