| Index: cc/trees/layer_tree_host_impl.h
|
| diff --git a/cc/trees/layer_tree_host_impl.h b/cc/trees/layer_tree_host_impl.h
|
| index f7391beba013ad58220cc6a794bc6881c400b401..fbb61c5e11e6bf7d15f037179a034b3e7db46fcc 100644
|
| --- a/cc/trees/layer_tree_host_impl.h
|
| +++ b/cc/trees/layer_tree_host_impl.h
|
| @@ -9,9 +9,9 @@
|
|
|
| #include <set>
|
| #include <string>
|
| +#include <unordered_map>
|
| #include <vector>
|
|
|
| -#include "base/containers/hash_tables.h"
|
| #include "base/macros.h"
|
| #include "base/memory/scoped_ptr.h"
|
| #include "base/time/time.h"
|
| @@ -702,8 +702,7 @@ class CC_EXPORT LayerTreeHostImpl
|
| bool ScrollAnimationUpdateTarget(LayerImpl* layer_impl,
|
| const gfx::Vector2dF& scroll_delta);
|
|
|
| - typedef base::hash_map<UIResourceId, UIResourceData>
|
| - UIResourceMap;
|
| + typedef std::unordered_map<UIResourceId, UIResourceData> UIResourceMap;
|
| UIResourceMap ui_resource_map_;
|
|
|
| // Resources that were evicted by EvictAllUIResources. Resources are removed
|
| @@ -805,7 +804,7 @@ class CC_EXPORT LayerTreeHostImpl
|
|
|
| // Map from scroll layer ID to scrollbar animation controller.
|
| // There is one animation controller per pair of overlay scrollbars.
|
| - base::ScopedPtrHashMap<int, scoped_ptr<ScrollbarAnimationController>>
|
| + std::unordered_map<int, scoped_ptr<ScrollbarAnimationController>>
|
| scrollbar_animation_controllers_;
|
|
|
| RenderingStatsInstrumentation* rendering_stats_instrumentation_;
|
|
|