| Index: cc/animation/animation_host.h
|
| diff --git a/cc/animation/animation_host.h b/cc/animation/animation_host.h
|
| index 1bec4ec0ff93ea4ba1f081b2c1334e5c1954f8fa..2cddf6a0d4e169355e8a554091bc32ed47d6ad45 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"
|
| @@ -167,8 +167,8 @@ 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>>
|
| - LayerToElementAnimationsMap;
|
| + using LayerToElementAnimationsMap =
|
| + std::unordered_map<int, scoped_ptr<ElementAnimations>>;
|
| LayerToElementAnimationsMap layer_to_element_animations_map_;
|
|
|
| AnimationTimelineList timelines_;
|
|
|