| Index: cc/trees/layer_tree_host.h
|
| diff --git a/cc/trees/layer_tree_host.h b/cc/trees/layer_tree_host.h
|
| index d8eba8d10738f8c715dc9e3dc8ab1e973f4779b4..52d33215916e2c8088a4ab911dcc588d2954c1ac 100644
|
| --- a/cc/trees/layer_tree_host.h
|
| +++ b/cc/trees/layer_tree_host.h
|
| @@ -11,10 +11,10 @@
|
| #include <limits>
|
| #include <set>
|
| #include <string>
|
| +#include <unordered_map>
|
| #include <vector>
|
|
|
| #include "base/cancelable_callback.h"
|
| -#include "base/containers/hash_tables.h"
|
| #include "base/macros.h"
|
| #include "base/memory/ref_counted.h"
|
| #include "base/memory/scoped_ptr.h"
|
| @@ -439,12 +439,12 @@ class CC_EXPORT LayerTreeHost : public MutatorHostClient {
|
| gfx::Size size;
|
| };
|
|
|
| - typedef base::hash_map<UIResourceId, UIResourceClientData>
|
| - UIResourceClientMap;
|
| + using UIResourceClientMap =
|
| + std::unordered_map<UIResourceId, UIResourceClientData>;
|
| UIResourceClientMap ui_resource_client_map_;
|
| int next_ui_resource_id_;
|
|
|
| - typedef std::vector<UIResourceRequest> UIResourceRequestQueue;
|
| + using UIResourceRequestQueue = std::vector<UIResourceRequest>;
|
| UIResourceRequestQueue ui_resource_request_queue_;
|
|
|
| void CalculateLCDTextMetricsCallback(Layer* layer);
|
| @@ -533,7 +533,7 @@ class CC_EXPORT LayerTreeHost : public MutatorHostClient {
|
|
|
| PropertyTrees property_trees_;
|
|
|
| - typedef base::hash_map<int, Layer*> LayerIdMap;
|
| + using LayerIdMap = std::unordered_map<int, Layer*>;
|
| LayerIdMap layer_id_map_;
|
|
|
| uint32_t surface_id_namespace_;
|
|
|