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

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

Issue 2425923003: Replaced is_null() with is_valid in SurfaceId and related classes. (Closed)
Patch Set: Removed added printf statements; LocalFrameId::is_valid() no longer checks if nonce is 0. Created 4 years, 2 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
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_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 #include "cc/surfaces/frame_sink_id.h"
15 15
16 namespace cc { 16 namespace cc {
17 17
18 // A per-surface-namespace sequence number that's used to coordinate 18 // A per-surface-namespace sequence number that's used to coordinate
19 // dependencies between frames. A sequence number may be satisfied once, and 19 // dependencies between frames. A sequence number may be satisfied once, and
20 // may be depended on once. 20 // may be depended on once.
21 struct SurfaceSequence { 21 struct SurfaceSequence {
22 SurfaceSequence() : sequence(0u) {} 22 SurfaceSequence() : sequence(0u) {}
23 SurfaceSequence(const FrameSinkId& frame_sink_id, uint32_t sequence) 23 SurfaceSequence(const FrameSinkId& frame_sink_id, uint32_t sequence)
24 : frame_sink_id(frame_sink_id), sequence(sequence) {} 24 : frame_sink_id(frame_sink_id), sequence(sequence) {
25 bool is_null() const { return frame_sink_id.is_null() && sequence == 0u; } 25 DCHECK(frame_sink_id.is_valid());
26 }
27 bool is_valid() const { return frame_sink_id.is_valid() && sequence > 0u; }
26 28
27 FrameSinkId frame_sink_id; 29 FrameSinkId frame_sink_id;
28 uint32_t sequence; 30 uint32_t sequence;
29 }; 31 };
30 32
31 inline bool operator==(const SurfaceSequence& a, const SurfaceSequence& b) { 33 inline bool operator==(const SurfaceSequence& a, const SurfaceSequence& b) {
32 return a.frame_sink_id == b.frame_sink_id && a.sequence == b.sequence; 34 return a.frame_sink_id == b.frame_sink_id && a.sequence == b.sequence;
33 } 35 }
34 36
35 inline bool operator!=(const SurfaceSequence& a, const SurfaceSequence& b) { 37 inline bool operator!=(const SurfaceSequence& a, const SurfaceSequence& b) {
36 return !(a == b); 38 return !(a == b);
37 } 39 }
38 40
39 inline bool operator<(const SurfaceSequence& a, const SurfaceSequence& b) { 41 inline bool operator<(const SurfaceSequence& a, const SurfaceSequence& b) {
40 return std::tie(a.frame_sink_id, a.sequence) < 42 return std::tie(a.frame_sink_id, a.sequence) <
41 std::tie(b.frame_sink_id, b.sequence); 43 std::tie(b.frame_sink_id, b.sequence);
42 } 44 }
43 45
44 struct SurfaceSequenceHash { 46 struct SurfaceSequenceHash {
45 size_t operator()(SurfaceSequence key) const { 47 size_t operator()(SurfaceSequence key) const {
46 return base::HashInts(static_cast<uint64_t>(key.frame_sink_id.hash()), 48 return base::HashInts(static_cast<uint64_t>(key.frame_sink_id.hash()),
47 key.sequence); 49 key.sequence);
48 } 50 }
49 }; 51 };
50 52
51 } // namespace cc 53 } // namespace cc
52 54
53 #endif // CC_SURFACES_SURFACE_SEQUENCE_H_ 55 #endif // CC_SURFACES_SURFACE_SEQUENCE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698