diff options
| author | davidben <davidben@chromium.org> | 2016-01-27 16:29:51 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-01-28 00:35:15 +0000 |
| commit | 5877ffe39d049730251b7f49f890c820e26643fa (patch) | |
| tree | 85afd4d3b8c30b36e911027329262a44a8ea9bc2 /cc/surfaces/surface_aggregator.h | |
| parent | a4861dc20689e685d8d91c436c9b0a02fc248b4e (diff) | |
| download | chromium_src-5877ffe39d049730251b7f49f890c820e26643fa.zip chromium_src-5877ffe39d049730251b7f49f890c820e26643fa.tar.gz chromium_src-5877ffe39d049730251b7f49f890c820e26643fa.tar.bz2 | |
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}
Diffstat (limited to 'cc/surfaces/surface_aggregator.h')
| -rw-r--r-- | cc/surfaces/surface_aggregator.h | 6 |
1 files changed, 2 insertions, 4 deletions
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 <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" @@ -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<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, @@ -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<SurfaceId> SurfaceSet; + using SurfaceSet = std::set<SurfaceId>; SurfaceSet referenced_surfaces_; // For each Surface used in the last aggregation, gives the frame_index at |