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_LOCAL_FRAME_ID_STRUCT_TRAITS_H_ | 5 #ifndef CC_IPC_LOCAL_FRAME_ID_STRUCT_TRAITS_H_ |
6 #define CC_IPC_LOCAL_FRAME_ID_STRUCT_TRAITS_H_ | 6 #define CC_IPC_LOCAL_FRAME_ID_STRUCT_TRAITS_H_ |
7 | 7 |
8 #include "cc/ipc/local_frame_id.mojom-shared.h" | 8 #include "cc/ipc/local_frame_id.mojom-shared.h" |
9 #include "cc/surfaces/local_frame_id.h" | 9 #include "cc/surfaces/local_frame_id.h" |
10 #include "mojo/common/common_custom_types_struct_traits.h" | |
10 | 11 |
11 namespace mojo { | 12 namespace mojo { |
12 | 13 |
13 template <> | 14 template <> |
14 struct StructTraits<cc::mojom::LocalFrameIdDataView, cc::LocalFrameId> { | 15 struct StructTraits<cc::mojom::LocalFrameIdDataView, cc::LocalFrameId> { |
15 static uint32_t local_id(const cc::LocalFrameId& local_frame_id) { | 16 static uint32_t local_id(const cc::LocalFrameId& local_frame_id) { |
16 return local_frame_id.local_id(); | 17 return local_frame_id.local_id(); |
17 } | 18 } |
18 | 19 |
19 static uint64_t nonce(const cc::LocalFrameId& local_frame_id) { | 20 static const base::UnguessableToken& nonce( |
21 const cc::LocalFrameId& local_frame_id) { | |
20 return local_frame_id.nonce(); | 22 return local_frame_id.nonce(); |
21 } | 23 } |
22 | 24 |
23 static bool Read(cc::mojom::LocalFrameIdDataView data, | 25 static bool Read(cc::mojom::LocalFrameIdDataView data, |
24 cc::LocalFrameId* out) { | 26 cc::LocalFrameId* out) { |
25 *out = cc::LocalFrameId(data.local_id(), data.nonce()); | 27 base::UnguessableToken nonce; |
28 if (!data.ReadNonce(&nonce)) { | |
Fady Samuel
2016/10/07 14:18:11
nit: drop the braces.
Alex Z.
2016/10/07 14:27:49
Done.
| |
29 return false; | |
30 } | |
31 *out = cc::LocalFrameId(data.local_id(), nonce); | |
26 return true; | 32 return true; |
27 } | 33 } |
28 }; | 34 }; |
29 | 35 |
30 } // namespace mojo | 36 } // namespace mojo |
31 | 37 |
32 #endif // CC_IPC_LOCAL_FRAME_ID_STRUCT_TRAITS_H_ | 38 #endif // CC_IPC_LOCAL_FRAME_ID_STRUCT_TRAITS_H_ |
OLD | NEW |