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

Side by Side Diff: cc/surfaces/surface.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, 11 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/resources/resource_provider_unittest.cc ('k') | cc/surfaces/surface.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_H_ 5 #ifndef CC_SURFACES_SURFACE_H_
6 #define CC_SURFACES_SURFACE_H_ 6 #define CC_SURFACES_SURFACE_H_
7 7
8 #include <stddef.h> 8 #include <stddef.h>
9 #include <stdint.h> 9 #include <stdint.h>
10 10
11 #include <map> 11 #include <map>
12 #include <set> 12 #include <set>
13 #include <unordered_set>
13 #include <vector> 14 #include <vector>
14 15
15 #include "base/callback.h" 16 #include "base/callback.h"
16 #include "base/containers/hash_tables.h"
17 #include "base/macros.h" 17 #include "base/macros.h"
18 #include "base/memory/scoped_ptr.h" 18 #include "base/memory/scoped_ptr.h"
19 #include "base/memory/weak_ptr.h" 19 #include "base/memory/weak_ptr.h"
20 #include "cc/output/copy_output_request.h" 20 #include "cc/output/copy_output_request.h"
21 #include "cc/quads/render_pass_id.h" 21 #include "cc/quads/render_pass_id.h"
22 #include "cc/surfaces/surface_factory.h" 22 #include "cc/surfaces/surface_factory.h"
23 #include "cc/surfaces/surface_id.h" 23 #include "cc/surfaces/surface_id.h"
24 #include "cc/surfaces/surface_sequence.h" 24 #include "cc/surfaces/surface_sequence.h"
25 #include "cc/surfaces/surfaces_export.h" 25 #include "cc/surfaces/surfaces_export.h"
26 #include "ui/gfx/geometry/size.h" 26 #include "ui/gfx/geometry/size.h"
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 64
65 base::WeakPtr<SurfaceFactory> factory() { return factory_; } 65 base::WeakPtr<SurfaceFactory> factory() { return factory_; }
66 66
67 // Add a SurfaceSequence that must be satisfied before the Surface is 67 // Add a SurfaceSequence that must be satisfied before the Surface is
68 // destroyed. 68 // destroyed.
69 void AddDestructionDependency(SurfaceSequence sequence); 69 void AddDestructionDependency(SurfaceSequence sequence);
70 70
71 // Satisfy all destruction dependencies that are contained in sequences, and 71 // Satisfy all destruction dependencies that are contained in sequences, and
72 // remove them from sequences. 72 // remove them from sequences.
73 void SatisfyDestructionDependencies( 73 void SatisfyDestructionDependencies(
74 base::hash_set<SurfaceSequence>* sequences, 74 std::unordered_set<SurfaceSequence, SurfaceSequenceHash>* sequences,
75 base::hash_set<uint32_t>* valid_id_namespaces); 75 std::unordered_set<uint32_t>* valid_id_namespaces);
76 size_t GetDestructionDependencyCount() const { 76 size_t GetDestructionDependencyCount() const {
77 return destruction_dependencies_.size(); 77 return destruction_dependencies_.size();
78 } 78 }
79 79
80 const std::vector<SurfaceId>& referenced_surfaces() const { 80 const std::vector<SurfaceId>& referenced_surfaces() const {
81 return referenced_surfaces_; 81 return referenced_surfaces_;
82 } 82 }
83 83
84 bool destroyed() const { return destroyed_; } 84 bool destroyed() const { return destroyed_; }
85 void set_destroyed(bool destroyed) { destroyed_ = destroyed; } 85 void set_destroyed(bool destroyed) { destroyed_ = destroyed; }
(...skipping 20 matching lines...) Expand all
106 std::vector<SurfaceId> referenced_surfaces_; 106 std::vector<SurfaceId> referenced_surfaces_;
107 107
108 DrawCallback draw_callback_; 108 DrawCallback draw_callback_;
109 109
110 DISALLOW_COPY_AND_ASSIGN(Surface); 110 DISALLOW_COPY_AND_ASSIGN(Surface);
111 }; 111 };
112 112
113 } // namespace cc 113 } // namespace cc
114 114
115 #endif // CC_SURFACES_SURFACE_H_ 115 #endif // CC_SURFACES_SURFACE_H_
OLDNEW
« no previous file with comments | « cc/resources/resource_provider_unittest.cc ('k') | cc/surfaces/surface.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698