Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(902)

Side by Side Diff: cc/surfaces/surface_factory.h

Issue 1587283002: Switch cc to std::unordered_*. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@unordered-map
Patch Set: Fix MSVC build issue Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « cc/surfaces/surface_aggregator.cc ('k') | cc/surfaces/surface_factory.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CC_SURFACES_SURFACE_FACTORY_H_ 5 #ifndef CC_SURFACES_SURFACE_FACTORY_H_
6 #define CC_SURFACES_SURFACE_FACTORY_H_ 6 #define CC_SURFACES_SURFACE_FACTORY_H_
7 7
8 #include <set> 8 #include <set>
9 #include <unordered_map> 9 #include <unordered_map>
10 10
11 #include "base/callback_forward.h" 11 #include "base/callback_forward.h"
12 #include "base/containers/scoped_ptr_hash_map.h"
13 #include "base/macros.h" 12 #include "base/macros.h"
14 #include "base/memory/scoped_ptr.h" 13 #include "base/memory/scoped_ptr.h"
15 #include "base/memory/weak_ptr.h" 14 #include "base/memory/weak_ptr.h"
16 #include "base/observer_list.h" 15 #include "base/observer_list.h"
17 #include "cc/output/compositor_frame.h" 16 #include "cc/output/compositor_frame.h"
18 #include "cc/surfaces/surface_id.h" 17 #include "cc/surfaces/surface_id.h"
19 #include "cc/surfaces/surface_resource_holder.h" 18 #include "cc/surfaces/surface_resource_holder.h"
20 #include "cc/surfaces/surface_sequence.h" 19 #include "cc/surfaces/surface_sequence.h"
21 #include "cc/surfaces/surfaces_export.h" 20 #include "cc/surfaces/surfaces_export.h"
22 21
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
89 using OwningSurfaceMap = 88 using OwningSurfaceMap =
90 std::unordered_map<SurfaceId, scoped_ptr<Surface>, SurfaceIdHash>; 89 std::unordered_map<SurfaceId, scoped_ptr<Surface>, SurfaceIdHash>;
91 OwningSurfaceMap surface_map_; 90 OwningSurfaceMap surface_map_;
92 91
93 DISALLOW_COPY_AND_ASSIGN(SurfaceFactory); 92 DISALLOW_COPY_AND_ASSIGN(SurfaceFactory);
94 }; 93 };
95 94
96 } // namespace cc 95 } // namespace cc
97 96
98 #endif // CC_SURFACES_SURFACE_FACTORY_H_ 97 #endif // CC_SURFACES_SURFACE_FACTORY_H_
OLDNEW
« no previous file with comments | « cc/surfaces/surface_aggregator.cc ('k') | cc/surfaces/surface_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698