From 5877ffe39d049730251b7f49f890c820e26643fa Mon Sep 17 00:00:00 2001 From: davidben Date: Wed, 27 Jan 2016 16:29:51 -0800 Subject: Switch cc to std::unordered_*. This removes all uses of base::hash_*, BASE_HASH_NAMESPACE, and base::ScopedPtrHashMap in favor of the C++11 versions. BUG=576864, 579229 CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel Review URL: https://codereview.chromium.org/1587283002 Cr-Commit-Position: refs/heads/master@{#371937} --- cc/surfaces/surface_aggregator.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'cc/surfaces/surface_aggregator.h') diff --git a/cc/surfaces/surface_aggregator.h b/cc/surfaces/surface_aggregator.h index c280758..b5a7fb9 100644 --- a/cc/surfaces/surface_aggregator.h +++ b/cc/surfaces/surface_aggregator.h @@ -9,8 +9,6 @@ #include #include -#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" @@ -90,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& resource_to_child_map, + const std::unordered_map& resource_to_child_map, const gfx::Transform& target_transform, const ClipData& clip_rect, RenderPass* dest_pass, @@ -133,7 +131,7 @@ class CC_SURFACES_EXPORT SurfaceAggregator { // This is the set of surfaces referenced in the aggregation so far, used to // detect cycles. - typedef std::set SurfaceSet; + using SurfaceSet = std::set; SurfaceSet referenced_surfaces_; // For each Surface used in the last aggregation, gives the frame_index at -- cgit v1.1