| Index: chrome/common/safe_browsing/protobuf_message_size_macros.h
|
| diff --git a/chrome/common/safe_browsing/protobuf_message_write_macros.h b/chrome/common/safe_browsing/protobuf_message_size_macros.h
|
| similarity index 56%
|
| copy from chrome/common/safe_browsing/protobuf_message_write_macros.h
|
| copy to chrome/common/safe_browsing/protobuf_message_size_macros.h
|
| index 578d23b2b18fc33b02bc477800c7411c6f2839cf..98be7281a6a3f571a5d5853b5b0872a291c28662 100644
|
| --- a/chrome/common/safe_browsing/protobuf_message_write_macros.h
|
| +++ b/chrome/common/safe_browsing/protobuf_message_size_macros.h
|
| @@ -2,13 +2,13 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef CHROME_COMMON_SAFE_BROWSING_PROTOBUF_MESSAGE_WRITE_MACROS_H_
|
| -#define CHROME_COMMON_SAFE_BROWSING_PROTOBUF_MESSAGE_WRITE_MACROS_H_
|
| +#ifndef CHROME_COMMON_SAFE_BROWSING_PROTOBUF_MESSAGE_SIZE_MACROS_H_
|
| +#define CHROME_COMMON_SAFE_BROWSING_PROTOBUF_MESSAGE_SIZE_MACROS_H_
|
|
|
| // Null out all the macros that need nulling.
|
| #include "chrome/common/safe_browsing/ipc_protobuf_message_null_macros.h"
|
|
|
| -// Set up so next include will generate write methods.
|
| +// Set up so next include will generate size methods.
|
| #undef IPC_PROTOBUF_MESSAGE_TRAITS_BEGIN
|
| #undef IPC_PROTOBUF_MESSAGE_TRAITS_OPTIONAL_FUNDAMENTAL_MEMBER
|
| #undef IPC_PROTOBUF_MESSAGE_TRAITS_OPTIONAL_COMPLEX_MEMBER
|
| @@ -16,18 +16,16 @@
|
| #undef IPC_PROTOBUF_MESSAGE_TRAITS_END
|
|
|
| #define IPC_PROTOBUF_MESSAGE_TRAITS_BEGIN(message_name) \
|
| - void ParamTraits<message_name>::Write(base::Pickle* m, const param_type& p) {
|
| + void ParamTraits<message_name>::GetSize(base::PickleSizer* s, \
|
| + const param_type& p) {
|
| #define IPC_PROTOBUF_MESSAGE_TRAITS_OPTIONAL_COMPLEX_MEMBER \
|
| IPC_PROTOBUF_MESSAGE_TRAITS_OPTIONAL_FUNDAMENTAL_MEMBER
|
| #define IPC_PROTOBUF_MESSAGE_TRAITS_OPTIONAL_FUNDAMENTAL_MEMBER(name) \
|
| - if (p.has_##name()) { \
|
| - m->WriteBool(true); \
|
| - WriteParam(m, p.name()); \
|
| - } else { \
|
| - m->WriteBool(false); \
|
| - }
|
| + s->AddBool(); \
|
| + if (p.has_##name()) \
|
| + GetParamSize(s, p.name());
|
| #define IPC_PROTOBUF_MESSAGE_TRAITS_REPEATED_COMPLEX_MEMBER(name) \
|
| - WriteParam(m, p.name());
|
| + GetParamSize(s, p.name());
|
| #define IPC_PROTOBUF_MESSAGE_TRAITS_END() }
|
|
|
| -#endif // CHROME_COMMON_SAFE_BROWSING_PROTOBUF_MESSAGE_WRITE_MACROS_H_
|
| +#endif // CHROME_COMMON_SAFE_BROWSING_PROTOBUF_MESSAGE_SIZE_MACROS_H_
|
|
|