OLD | NEW |
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_SEQUENCE_H_ | 5 #ifndef CC_SURFACES_SURFACE_SEQUENCE_H_ |
6 #define CC_SURFACES_SURFACE_SEQUENCE_H_ | 6 #define CC_SURFACES_SURFACE_SEQUENCE_H_ |
7 | 7 |
8 #include <stddef.h> | 8 #include <stddef.h> |
9 #include <stdint.h> | 9 #include <stdint.h> |
10 | 10 |
11 #include <tuple> | 11 #include <tuple> |
12 | 12 |
13 #include "base/hash.h" | 13 #include "base/hash.h" |
| 14 #include "cc/surfaces/frame_sink_id.h" |
14 | 15 |
15 namespace cc { | 16 namespace cc { |
16 | 17 |
17 // A per-surface-namespace sequence number that's used to coordinate | 18 // A per-surface-namespace sequence number that's used to coordinate |
18 // dependencies between frames. A sequence number may be satisfied once, and | 19 // dependencies between frames. A sequence number may be satisfied once, and |
19 // may be depended on once. | 20 // may be depended on once. |
20 struct SurfaceSequence { | 21 struct SurfaceSequence { |
21 SurfaceSequence() : client_id(0u), sequence(0u) {} | 22 SurfaceSequence() : sequence(0u) {} |
22 SurfaceSequence(uint32_t client_id, uint32_t sequence) | 23 SurfaceSequence(const FrameSinkId& frame_sink_id, uint32_t sequence) |
23 : client_id(client_id), sequence(sequence) {} | 24 : frame_sink_id(frame_sink_id), sequence(sequence) {} |
24 bool is_null() const { return client_id == 0u && sequence == 0u; } | 25 bool is_null() const { return frame_sink_id.is_null() && sequence == 0u; } |
25 | 26 |
26 uint32_t client_id; | 27 FrameSinkId frame_sink_id; |
27 uint32_t sequence; | 28 uint32_t sequence; |
28 }; | 29 }; |
29 | 30 |
30 inline bool operator==(const SurfaceSequence& a, const SurfaceSequence& b) { | 31 inline bool operator==(const SurfaceSequence& a, const SurfaceSequence& b) { |
31 return a.client_id == b.client_id && a.sequence == b.sequence; | 32 return a.frame_sink_id == b.frame_sink_id && a.sequence == b.sequence; |
32 } | 33 } |
33 | 34 |
34 inline bool operator!=(const SurfaceSequence& a, const SurfaceSequence& b) { | 35 inline bool operator!=(const SurfaceSequence& a, const SurfaceSequence& b) { |
35 return !(a == b); | 36 return !(a == b); |
36 } | 37 } |
37 | 38 |
38 inline bool operator<(const SurfaceSequence& a, const SurfaceSequence& b) { | 39 inline bool operator<(const SurfaceSequence& a, const SurfaceSequence& b) { |
39 return std::tie(a.client_id, a.sequence) < std::tie(b.client_id, b.sequence); | 40 return std::tie(a.frame_sink_id, a.sequence) < |
| 41 std::tie(b.frame_sink_id, b.sequence); |
40 } | 42 } |
41 | 43 |
42 struct SurfaceSequenceHash { | 44 struct SurfaceSequenceHash { |
43 size_t operator()(SurfaceSequence key) const { | 45 size_t operator()(SurfaceSequence key) const { |
44 return base::HashInts(key.client_id, key.sequence); | 46 return base::HashInts(key.frame_sink_id.hash(), key.sequence); |
45 } | 47 } |
46 }; | 48 }; |
47 | 49 |
48 } // namespace cc | 50 } // namespace cc |
49 | 51 |
50 #endif // CC_SURFACES_SURFACE_SEQUENCE_H_ | 52 #endif // CC_SURFACES_SURFACE_SEQUENCE_H_ |
OLD | NEW |