Index: cc/animation/animation_player.h |
diff --git a/cc/animation/animation_player.h b/cc/animation/animation_player.h |
index afb819d5c5e1816b664f56740d4475a49958b300..4656d3250dcd40ac859cb4d8d4b31c226609395d 100644 |
--- a/cc/animation/animation_player.h |
+++ b/cc/animation/animation_player.h |
@@ -5,12 +5,13 @@ |
#ifndef CC_ANIMATION_ANIMATION_PLAYER_H_ |
#define CC_ANIMATION_ANIMATION_PLAYER_H_ |
+#include <vector> |
+ |
#include "base/containers/linked_list.h" |
#include "base/memory/ref_counted.h" |
#include "base/time/time.h" |
#include "cc/animation/animation.h" |
#include "cc/base/cc_export.h" |
-#include "cc/base/scoped_ptr_vector.h" |
namespace cc { |
@@ -94,7 +95,7 @@ class CC_EXPORT AnimationPlayer : public base::RefCounted<AnimationPlayer>, |
// We accumulate added animations in animations_ container |
// if element_animations_ is a nullptr. It allows us to add/remove animations |
// to non-attached AnimationPlayers. |
- typedef ScopedPtrVector<Animation> AnimationList; |
+ typedef std::vector<scoped_ptr<Animation>> AnimationList; |
danakj
2015/11/17 01:12:16
drop the typedef, just use the concrete type?
vmpstr
2015/11/17 23:26:23
Done.
|
AnimationList animations_; |
AnimationHost* animation_host_; |