OLD | NEW |
---|---|
1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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_LOCAL_FRAME_ID_H_ | 5 #ifndef CC_SURFACES_LOCAL_FRAME_ID_H_ |
6 #define CC_SURFACES_LOCAL_FRAME_ID_H_ | 6 #define CC_SURFACES_LOCAL_FRAME_ID_H_ |
7 | 7 |
8 #include <inttypes.h> | 8 #include <inttypes.h> |
9 #include <tuple> | 9 #include <tuple> |
10 | 10 |
11 #include "base/hash.h" | 11 #include "base/hash.h" |
12 #include "base/strings/stringprintf.h" | 12 #include "base/strings/stringprintf.h" |
13 #include "base/unguessable_token.h" | |
13 | 14 |
14 namespace cc { | 15 namespace cc { |
15 | 16 |
16 class LocalFrameId { | 17 class LocalFrameId { |
17 public: | 18 public: |
18 constexpr LocalFrameId() : local_id_(0), nonce_(0) {} | 19 constexpr LocalFrameId() : local_id_(0) {} |
19 | 20 |
20 constexpr LocalFrameId(const LocalFrameId& other) | 21 constexpr LocalFrameId(const LocalFrameId& other) |
21 : local_id_(other.local_id_), nonce_(other.nonce_) {} | 22 : local_id_(other.local_id_), nonce_(other.nonce_) {} |
22 | 23 |
23 constexpr LocalFrameId(uint32_t local_id, uint64_t nonce) | 24 explicit LocalFrameId(uint32_t local_id) |
Fady Samuel
2016/10/07 14:18:11
Do we need this constructor? Can we simply create
Alex Z.
2016/10/07 14:27:49
Done.
| |
25 : local_id_(local_id), nonce_(base::UnguessableToken::Create()) {} | |
26 | |
27 constexpr LocalFrameId(uint32_t local_id, const base::UnguessableToken& nonce) | |
24 : local_id_(local_id), nonce_(nonce) {} | 28 : local_id_(local_id), nonce_(nonce) {} |
25 | 29 |
26 constexpr bool is_null() const { return local_id_ == 0 && nonce_ == 0; } | 30 constexpr bool is_null() const { return local_id_ == 0 && nonce_.is_empty(); } |
27 | 31 |
28 constexpr uint32_t local_id() const { return local_id_; } | 32 constexpr uint32_t local_id() const { return local_id_; } |
29 | 33 |
30 constexpr uint64_t nonce() const { return nonce_; } | 34 constexpr const base::UnguessableToken& nonce() const { return nonce_; } |
31 | 35 |
32 bool operator==(const LocalFrameId& other) const { | 36 bool operator==(const LocalFrameId& other) const { |
33 return local_id_ == other.local_id_ && nonce_ == other.nonce_; | 37 return local_id_ == other.local_id_ && nonce_ == other.nonce_; |
34 } | 38 } |
35 | 39 |
36 bool operator!=(const LocalFrameId& other) const { return !(*this == other); } | 40 bool operator!=(const LocalFrameId& other) const { return !(*this == other); } |
37 | 41 |
38 bool operator<(const LocalFrameId& other) const { | 42 bool operator<(const LocalFrameId& other) const { |
39 return std::tie(local_id_, nonce_) < | 43 return std::tie(local_id_, nonce_) < |
40 std::tie(other.local_id_, other.nonce_); | 44 std::tie(other.local_id_, other.nonce_); |
41 } | 45 } |
42 | 46 |
43 size_t hash() const { return base::HashInts(local_id_, nonce_); } | 47 size_t hash() const { |
48 return base::HashInts(local_id_, base::UnguessableTokenHash()(nonce_)); | |
49 } | |
44 | 50 |
45 std::string ToString() const { | 51 std::string ToString() const { |
46 return base::StringPrintf("LocalFrameId(%d, %" PRIu64 ")", local_id_, | 52 return base::StringPrintf("LocalFrameId(%d, %s" PRIu64 ")", local_id_, |
47 nonce_); | 53 nonce_.ToString().c_str()); |
48 } | 54 } |
49 | 55 |
50 private: | 56 private: |
51 uint32_t local_id_; | 57 uint32_t local_id_; |
52 uint64_t nonce_; | 58 base::UnguessableToken nonce_; |
53 }; | 59 }; |
54 | 60 |
55 struct LocalFrameIdHash { | 61 struct LocalFrameIdHash { |
56 size_t operator()(const LocalFrameId& key) const { return key.hash(); } | 62 size_t operator()(const LocalFrameId& key) const { return key.hash(); } |
57 }; | 63 }; |
58 | 64 |
59 } // namespace cc | 65 } // namespace cc |
60 | 66 |
61 #endif // CC_SURFACES_LOCAL_FRAME_ID_H_ | 67 #endif // CC_SURFACES_LOCAL_FRAME_ID_H_ |
OLD | NEW |