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_IPC_SURFACE_SEQUENCE_STRUCT_TRAITS_H_ | 5 #ifndef CC_IPC_SURFACE_SEQUENCE_STRUCT_TRAITS_H_ |
6 #define CC_IPC_SURFACE_SEQUENCE_STRUCT_TRAITS_H_ | 6 #define CC_IPC_SURFACE_SEQUENCE_STRUCT_TRAITS_H_ |
7 | 7 |
8 #include "cc/ipc/surface_sequence.mojom-shared.h" | 8 #include "cc/ipc/surface_sequence.mojom-shared.h" |
9 #include "cc/surfaces/surface_sequence.h" | 9 #include "cc/surfaces/surface_sequence.h" |
10 | 10 |
11 namespace mojo { | 11 namespace mojo { |
12 | 12 |
13 template <> | 13 template <> |
14 struct StructTraits<cc::mojom::SurfaceSequenceDataView, cc::SurfaceSequence> { | 14 struct StructTraits<cc::mojom::SurfaceSequenceDataView, cc::SurfaceSequence> { |
15 static uint32_t client_id(const cc::SurfaceSequence& id) { | 15 static const cc::FrameSinkId& frame_sink_id(const cc::SurfaceSequence& id) { |
16 return id.client_id; | 16 return id.frame_sink_id; |
17 } | 17 } |
18 | 18 |
19 static uint32_t sequence(const cc::SurfaceSequence& id) { | 19 static uint32_t sequence(const cc::SurfaceSequence& id) { |
20 return id.sequence; | 20 return id.sequence; |
21 } | 21 } |
22 | 22 |
23 static bool Read(cc::mojom::SurfaceSequenceDataView data, | 23 static bool Read(cc::mojom::SurfaceSequenceDataView data, |
24 cc::SurfaceSequence* out) { | 24 cc::SurfaceSequence* out) { |
25 *out = cc::SurfaceSequence(data.client_id(), data.sequence()); | 25 cc::FrameSinkId frame_sink_id; |
| 26 if (!data.ReadFrameSinkId(&frame_sink_id)) |
| 27 return false; |
| 28 *out = cc::SurfaceSequence(frame_sink_id, data.sequence()); |
26 return true; | 29 return true; |
27 } | 30 } |
28 }; | 31 }; |
29 | 32 |
30 } // namespace mojo | 33 } // namespace mojo |
31 | 34 |
32 #endif // CC_IPC_SURFACE_SEQUENCE_STRUCT_TRAITS_H_ | 35 #endif // CC_IPC_SURFACE_SEQUENCE_STRUCT_TRAITS_H_ |
OLD | NEW |