diff options
Diffstat (limited to 'chromium/cc/animation/element_animations.h')
-rw-r--r-- | chromium/cc/animation/element_animations.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/chromium/cc/animation/element_animations.h b/chromium/cc/animation/element_animations.h index 5ee709d2716..a07b63e544b 100644 --- a/chromium/cc/animation/element_animations.h +++ b/chromium/cc/animation/element_animations.h @@ -12,10 +12,10 @@ #include "base/memory/ref_counted.h" #include "base/observer_list.h" #include "base/time/time.h" -#include "cc/animation/element_id.h" -#include "cc/animation/property_animation_state.h" -#include "cc/animation/target_property.h" #include "cc/base/cc_export.h" +#include "cc/trees/element_id.h" +#include "cc/trees/property_animation_state.h" +#include "cc/trees/target_property.h" #include "ui/gfx/geometry/scroll_offset.h" #include "ui/gfx/transform.h" @@ -25,7 +25,6 @@ class BoxF; namespace cc { -class AnimationDelegate; class AnimationEvents; class AnimationHost; class AnimationPlayer; @@ -60,7 +59,7 @@ class CC_EXPORT ElementAnimations : public base::RefCounted<ElementAnimations> { bool IsEmpty() const; typedef base::ObserverList<AnimationPlayer> PlayersList; - PlayersList& players_list() const { return *players_list_.get(); } + const PlayersList& players_list() const { return players_list_; } // Ensures that the list of active animations on the main thread and the impl // thread are kept in sync. This function does not take ownership of the impl @@ -199,7 +198,7 @@ class CC_EXPORT ElementAnimations : public base::RefCounted<ElementAnimations> { static TargetProperties GetPropertiesMaskForAnimationState(); - std::unique_ptr<PlayersList> players_list_; + PlayersList players_list_; AnimationHost* animation_host_; ElementId element_id_; |