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

cc/animation/animation_player.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_ANIMATION_PLAYER_H_
 #define CC_ANIMATION_ANIMATION_PLAYER_H_
 
-#include <bitset>
 #include <vector>
 
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/time/time.h"
 #include "cc/animation/animation.h"
 #include "cc/animation/animation_curve.h"
 #include "cc/animation/element_animations.h"
 #include "cc/animation/element_id.h"
 #include "cc/base/cc_export.h"
@@ skipping 81 matching lines @@
   void StartAnimations(base::TimeTicks monotonic_time);
   void PromoteStartedAnimations(base::TimeTicks monotonic_time,
                                 AnimationEvents* events);
   void MarkAnimationsForDeletion(base::TimeTicks monotonic_time,
                                  AnimationEvents* events);
   void TickAnimations(base::TimeTicks monotonic_time);
   void MarkFinishedAnimations(base::TimeTicks monotonic_time);
 
   // 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(bool* changed_transform_animation,
-                          bool* changed_opacity_animation,
-                          bool* changed_filter_animation);
+  // are deleted. Returns a set of properties with animations activated.
+  TargetProperties ActivateAnimations();
 
   bool HasFilterAnimationThatInflatesBounds() const;
   bool HasTransformAnimationThatInflatesBounds() const;
 
   bool TransformAnimationBoundsForBox(const gfx::BoxF& box,
                                       gfx::BoxF* bounds) const;
   bool HasAnimationThatAffectsScale() const;
   bool HasOnlyTranslationTransforms(ElementListType list_type) const;
   bool AnimationsPreserveAxisAlignment() const;
 
@@ skipping 21 matching lines @@
   bool HasElementInActiveList() const;
   gfx::ScrollOffset ScrollOffsetForAnimation() const;
 
   // 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;
 
-  void GetPropertyAnimationStateFor(TargetProperty::Type property,
-                                    PropertyAnimationState* state) const;
+  void GetPropertyAnimationState(PropertyAnimationState* pending_state,
+                                 PropertyAnimationState* active_state) const;
 
  private:
   friend class base::RefCounted<AnimationPlayer>;
 
   explicit AnimationPlayer(int id);
   ~AnimationPlayer();
 
-  // A set of target properties. TargetProperty must be 0-based enum.
-  using TargetProperties =
-      std::bitset<TargetProperty::LAST_TARGET_PROPERTY + 1>;
-
   void SetNeedsCommit();
 
   void RegisterPlayer();
   void UnregisterPlayer();
 
   void BindElementAnimations();
   void UnbindElementAnimations();
 
   void AnimationAddedForProperty(TargetProperty::Type target_property);
 
@@ skipping 23 matching lines @@
   // 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_;
 
   DISALLOW_COPY_AND_ASSIGN(AnimationPlayer);
 };
 
 }  // namespace cc
 
 #endif  // CC_ANIMATION_ANIMATION_PLAYER_H_