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

Side by Side Diff: chrome/common/safe_browsing/protobuf_message_read_macros.h

Issue 1659003003: IPC::Message -> base::Pickle (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: one more mac fix Created 4 years, 10 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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 CHROME_COMMON_SAFE_BROWSING_PROTOBUF_MESSAGE_READ_MACROS_H_ 5 #ifndef CHROME_COMMON_SAFE_BROWSING_PROTOBUF_MESSAGE_READ_MACROS_H_
6 #define CHROME_COMMON_SAFE_BROWSING_PROTOBUF_MESSAGE_READ_MACROS_H_ 6 #define CHROME_COMMON_SAFE_BROWSING_PROTOBUF_MESSAGE_READ_MACROS_H_
7 7
8 // Null out all the macros that need nulling. 8 // Null out all the macros that need nulling.
9 #include "chrome/common/safe_browsing/ipc_protobuf_message_null_macros.h" 9 #include "chrome/common/safe_browsing/ipc_protobuf_message_null_macros.h"
10 10
11 // Set up so next include will generate read methods. 11 // Set up so next include will generate read methods.
12 #undef IPC_PROTOBUF_MESSAGE_TRAITS_BEGIN 12 #undef IPC_PROTOBUF_MESSAGE_TRAITS_BEGIN
13 #undef IPC_PROTOBUF_MESSAGE_TRAITS_OPTIONAL_FUNDAMENTAL_MEMBER 13 #undef IPC_PROTOBUF_MESSAGE_TRAITS_OPTIONAL_FUNDAMENTAL_MEMBER
14 #undef IPC_PROTOBUF_MESSAGE_TRAITS_OPTIONAL_COMPLEX_MEMBER 14 #undef IPC_PROTOBUF_MESSAGE_TRAITS_OPTIONAL_COMPLEX_MEMBER
15 #undef IPC_PROTOBUF_MESSAGE_TRAITS_REPEATED_COMPLEX_MEMBER 15 #undef IPC_PROTOBUF_MESSAGE_TRAITS_REPEATED_COMPLEX_MEMBER
16 #undef IPC_PROTOBUF_MESSAGE_TRAITS_END 16 #undef IPC_PROTOBUF_MESSAGE_TRAITS_END
17 17
18 #define IPC_PROTOBUF_MESSAGE_TRAITS_BEGIN(message_name) \ 18 #define IPC_PROTOBUF_MESSAGE_TRAITS_BEGIN(message_name) \
19 template <class P> \ 19 template <class P> \
20 bool ParamTraits<message_name>::ReadParamF( \ 20 bool ParamTraits<message_name>::ReadParamF( \
21 const Message* m, base::PickleIterator* iter, param_type* p, \ 21 const base::Pickle* m, base::PickleIterator* iter, param_type* p, \
22 void (param_type::*setter_function)(P)) { \ 22 void (param_type::*setter_function)(P)) { \
23 P value; \ 23 P value; \
24 if (!ReadParam(m, iter, &value)) \ 24 if (!ReadParam(m, iter, &value)) \
25 return false; \ 25 return false; \
26 (p->*setter_function)(value); \ 26 (p->*setter_function)(value); \
27 return true; \ 27 return true; \
28 } \ 28 } \
29 bool ParamTraits<message_name>::Read(const Message* m, \ 29 bool ParamTraits<message_name>::Read( \
30 base::PickleIterator* iter, \ 30 const base::Pickle* m, base::PickleIterator* iter, param_type* p) {
31 param_type* p) {
32
33 #define IPC_PROTOBUF_MESSAGE_TRAITS_OPTIONAL_FUNDAMENTAL_MEMBER(name) \ 31 #define IPC_PROTOBUF_MESSAGE_TRAITS_OPTIONAL_FUNDAMENTAL_MEMBER(name) \
34 { \ 32 { \
35 bool is_present; \ 33 bool is_present; \
36 if (!iter->ReadBool(&is_present)) \ 34 if (!iter->ReadBool(&is_present)) \
37 return false; \ 35 return false; \
38 if (!is_present) \ 36 if (!is_present) \
39 p->clear_##name(); \ 37 p->clear_##name(); \
40 else if (!ReadParamF(m, iter, p, &param_type::set_##name)) \ 38 else if (!ReadParamF(m, iter, p, &param_type::set_##name)) \
41 return false; \ 39 return false; \
42 } 40 }
(...skipping 11 matching lines...) Expand all
54 52
55 #define IPC_PROTOBUF_MESSAGE_TRAITS_REPEATED_COMPLEX_MEMBER(name) \ 53 #define IPC_PROTOBUF_MESSAGE_TRAITS_REPEATED_COMPLEX_MEMBER(name) \
56 if (!ReadParam(m, iter, p->mutable_##name())) \ 54 if (!ReadParam(m, iter, p->mutable_##name())) \
57 return false; 55 return false;
58 56
59 #define IPC_PROTOBUF_MESSAGE_TRAITS_END() \ 57 #define IPC_PROTOBUF_MESSAGE_TRAITS_END() \
60 return true; \ 58 return true; \
61 } 59 }
62 60
63 #endif // CHROME_COMMON_SAFE_BROWSING_PROTOBUF_MESSAGE_READ_MACROS_H_ 61 #endif // CHROME_COMMON_SAFE_BROWSING_PROTOBUF_MESSAGE_READ_MACROS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698