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

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

Issue 623383002: Align base::hash_map with C++11, part 2. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@hash-1
Patch Set: clean up stale includes Created 6 years, 1 month 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/quads/render_pass.h ('k') | chrome/browser/browsing_data/canonical_cookie_hash.h » ('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_ID_H_ 5 #ifndef CC_SURFACES_SURFACE_ID_H_
6 #define CC_SURFACES_SURFACE_ID_H_ 6 #define CC_SURFACES_SURFACE_ID_H_
7 7
8 #include "base/compiler_specific.h"
9 #include "base/containers/hash_tables.h" 8 #include "base/containers/hash_tables.h"
10 9
11 namespace cc { 10 namespace cc {
12 11
13 struct SurfaceId { 12 struct SurfaceId {
14 SurfaceId() : id(0) {} 13 SurfaceId() : id(0) {}
15 explicit SurfaceId(uint64_t id) : id(id) {} 14 explicit SurfaceId(uint64_t id) : id(id) {}
16 15
17 bool is_null() const { return id == 0; } 16 bool is_null() const { return id == 0; }
18 17
19 uint64_t id; 18 uint64_t id;
20 }; 19 };
21 20
22 inline bool operator==(const SurfaceId& a, const SurfaceId& b) { 21 inline bool operator==(const SurfaceId& a, const SurfaceId& b) {
23 return a.id == b.id; 22 return a.id == b.id;
24 } 23 }
25 24
26 inline bool operator!=(const SurfaceId& a, const SurfaceId& b) { 25 inline bool operator!=(const SurfaceId& a, const SurfaceId& b) {
27 return !(a == b); 26 return !(a == b);
28 } 27 }
29 28
30 inline bool operator<(const SurfaceId& a, const SurfaceId& b) { 29 inline bool operator<(const SurfaceId& a, const SurfaceId& b) {
31 return a.id < b.id; 30 return a.id < b.id;
32 } 31 }
33 32
34 } // namespace cc 33 } // namespace cc
35 34
36 namespace BASE_HASH_NAMESPACE { 35 namespace BASE_HASH_NAMESPACE {
37 #if defined(COMPILER_MSVC)
38 inline size_t hash_value(const cc::SurfaceId& key) {
39 return hash_value(key.id);
40 }
41 #elif defined(COMPILER_GCC)
42 template <> 36 template <>
43 struct hash<cc::SurfaceId> { 37 struct hash<cc::SurfaceId> {
44 size_t operator()(cc::SurfaceId key) const { 38 size_t operator()(cc::SurfaceId key) const {
45 return hash<uint64_t>()(key.id); 39 return hash<uint64_t>()(key.id);
46 } 40 }
47 }; 41 };
48 #else
49 #error define a hash function for your compiler
50 #endif // COMPILER
51 } // namespace BASE_HASH_NAMESPACE 42 } // namespace BASE_HASH_NAMESPACE
52 43
53 #endif // CC_SURFACES_SURFACE_ID_H_ 44 #endif // CC_SURFACES_SURFACE_ID_H_
OLDNEW
« no previous file with comments | « cc/quads/render_pass.h ('k') | chrome/browser/browsing_data/canonical_cookie_hash.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698