| Index: cc/animation/animation_host.h
|
| diff --git a/cc/animation/animation_host.h b/cc/animation/animation_host.h
|
| index ad5117cafb19d151121bf52beb08ed9848730348..fc81a5f8a9d63ef9d8a65e8cfa3ec10a9116f1da 100644
|
| --- a/cc/animation/animation_host.h
|
| +++ b/cc/animation/animation_host.h
|
| @@ -5,9 +5,9 @@
|
| #ifndef CC_ANIMATION_ANIMATION_HOST_H_
|
| #define CC_ANIMATION_ANIMATION_HOST_H_
|
|
|
| +#include <unordered_map>
|
| #include <vector>
|
|
|
| -#include "base/containers/scoped_ptr_hash_map.h"
|
| #include "base/macros.h"
|
| #include "base/memory/ref_counted.h"
|
| #include "base/memory/scoped_ptr.h"
|
| @@ -162,7 +162,7 @@ class CC_EXPORT AnimationHost {
|
| // TODO(loyso): For now AnimationPlayers share LayerAnimationController object
|
| // if they are attached to the same element(layer). Note that Element can
|
| // contain many Layers.
|
| - typedef base::ScopedPtrHashMap<int, scoped_ptr<ElementAnimations>>
|
| + typedef std::unordered_map<int, scoped_ptr<ElementAnimations>>
|
| LayerToElementAnimationsMap;
|
| LayerToElementAnimationsMap layer_to_element_animations_map_;
|
|
|
|
|