Index: cc/surfaces/surface_aggregator.h |
diff --git a/cc/surfaces/surface_aggregator.h b/cc/surfaces/surface_aggregator.h |
index 0b640a93280a585a8e5d424f962c1475210aa2f4..6f2f844ba52ab8097fafe38c6957509bf788186e 100644 |
--- a/cc/surfaces/surface_aggregator.h |
+++ b/cc/surfaces/surface_aggregator.h |
@@ -6,9 +6,9 @@ |
#define CC_SURFACES_SURFACE_AGGREGATOR_H_ |
#include <set> |
+#include <unordered_map> |
+#include <unordered_set> |
-#include "base/containers/hash_tables.h" |
-#include "base/containers/scoped_ptr_hash_map.h" |
#include "base/macros.h" |
#include "base/memory/scoped_ptr.h" |
#include "cc/quads/draw_quad.h" |
@@ -36,7 +36,7 @@ class CC_SURFACES_EXPORT SurfaceAggregatorClient { |
class CC_SURFACES_EXPORT SurfaceAggregator { |
public: |
- typedef base::hash_map<SurfaceId, int> SurfaceIndexMap; |
+ typedef std::unordered_map<SurfaceId, int, SurfaceIdHash> SurfaceIndexMap; |
SurfaceAggregator(SurfaceAggregatorClient* client, |
SurfaceManager* manager, |
@@ -88,7 +88,7 @@ class CC_SURFACES_EXPORT SurfaceAggregator { |
void CopyQuadsToPass( |
const QuadList& source_quad_list, |
const SharedQuadStateList& source_shared_quad_state_list, |
- const base::hash_map<ResourceId, ResourceId>& resource_to_child_map, |
+ const std::unordered_map<ResourceId, ResourceId>& resource_to_child_map, |
const gfx::Transform& target_transform, |
const ClipData& clip_rect, |
RenderPass* dest_pass, |
@@ -113,13 +113,15 @@ class CC_SURFACES_EXPORT SurfaceAggregator { |
ResourceProvider* provider_; |
class RenderPassIdAllocator; |
- typedef base::ScopedPtrHashMap<SurfaceId, scoped_ptr<RenderPassIdAllocator>> |
- RenderPassIdAllocatorMap; |
+ typedef std::unordered_map<SurfaceId, |
+ scoped_ptr<RenderPassIdAllocator>, |
+ SurfaceIdHash> RenderPassIdAllocatorMap; |
RenderPassIdAllocatorMap render_pass_allocator_map_; |
int next_render_pass_id_; |
const bool aggregate_only_damaged_; |
- typedef base::hash_map<SurfaceId, int> SurfaceToResourceChildIdMap; |
+ typedef std::unordered_map<SurfaceId, int, SurfaceIdHash> |
+ SurfaceToResourceChildIdMap; |
SurfaceToResourceChildIdMap surface_id_to_resource_child_id_; |
// The following state is only valid for the duration of one Aggregate call |
@@ -137,7 +139,7 @@ class CC_SURFACES_EXPORT SurfaceAggregator { |
SurfaceIndexMap contained_surfaces_; |
// After surface validation, every Surface in this set is valid. |
- base::hash_set<SurfaceId> valid_surfaces_; |
+ std::unordered_set<SurfaceId, SurfaceIdHash> valid_surfaces_; |
// This is the pass list for the aggregated frame. |
RenderPassList* dest_pass_list_; |