| Index: content/common/content_param_traits.cc
|
| diff --git a/content/common/content_param_traits.cc b/content/common/content_param_traits.cc
|
| index 6cff525a3d340256d7c1a89a7366cebc61ad6d12..d38e9310fed42b5a1c7c59e42c2048b16ce480ba 100644
|
| --- a/content/common/content_param_traits.cc
|
| +++ b/content/common/content_param_traits.cc
|
| @@ -14,12 +14,12 @@ namespace IPC {
|
|
|
| void ParamTraits<WebInputEventPointer>::GetSize(base::PickleSizer* s,
|
| const param_type& p) {
|
| - s->AddData(p->size);
|
| + s->AddData(p->size());
|
| }
|
|
|
| void ParamTraits<WebInputEventPointer>::Write(base::Pickle* m,
|
| const param_type& p) {
|
| - m->WriteData(reinterpret_cast<const char*>(p), p->size);
|
| + m->WriteData(reinterpret_cast<const char*>(p), p->size());
|
| }
|
|
|
| bool ParamTraits<WebInputEventPointer>::Read(const base::Pickle* m,
|
| @@ -37,12 +37,12 @@ bool ParamTraits<WebInputEventPointer>::Read(const base::Pickle* m,
|
| }
|
| param_type event = reinterpret_cast<param_type>(data);
|
| // Check that the data size matches that of the event.
|
| - if (data_length != static_cast<int>(event->size)) {
|
| + if (data_length != static_cast<int>(event->size())) {
|
| NOTREACHED();
|
| return false;
|
| }
|
| const size_t expected_size_for_type =
|
| - ui::WebInputEventTraits::GetSize(event->type);
|
| + ui::WebInputEventTraits::GetSize(event->type());
|
| if (data_length != static_cast<int>(expected_size_for_type)) {
|
| NOTREACHED();
|
| return false;
|
| @@ -54,11 +54,11 @@ bool ParamTraits<WebInputEventPointer>::Read(const base::Pickle* m,
|
| void ParamTraits<WebInputEventPointer>::Log(const param_type& p,
|
| std::string* l) {
|
| l->append("(");
|
| - LogParam(p->size, l);
|
| + LogParam(p->size(), l);
|
| l->append(", ");
|
| - LogParam(p->type, l);
|
| + LogParam(p->type(), l);
|
| l->append(", ");
|
| - LogParam(p->timeStampSeconds, l);
|
| + LogParam(p->timeStampSeconds(), l);
|
| l->append(")");
|
| }
|
|
|
|
|