| Index: content/common/input/input_param_traits.cc
|
| diff --git a/content/common/input/input_param_traits.cc b/content/common/input/input_param_traits.cc
|
| index 0fc7a56f56a2b4973a055dfc3deeb1c7ea92c60d..8f49d29da4209901d04f08d899b64e647933a481 100644
|
| --- a/content/common/input/input_param_traits.cc
|
| +++ b/content/common/input/input_param_traits.cc
|
| @@ -28,25 +28,28 @@ std::unique_ptr<content::SyntheticGestureParams> ReadGestureParams(
|
| }
|
| } // namespace
|
|
|
| -void ParamTraits<ui::ScopedWebInputEvent>::GetSize(base::PickleSizer* s,
|
| - const param_type& p) {
|
| +void ParamTraits<blink::CoalescedWebInputEvent::ScopedWebInputEvent>::GetSize(
|
| + base::PickleSizer* s,
|
| + const param_type& p) {
|
| bool valid_web_event = !!p;
|
| GetParamSize(s, valid_web_event);
|
| if (valid_web_event)
|
| GetParamSize(s, static_cast<WebInputEventPointer>(p.get()));
|
| }
|
|
|
| -void ParamTraits<ui::ScopedWebInputEvent>::Write(base::Pickle* m,
|
| - const param_type& p) {
|
| +void ParamTraits<blink::CoalescedWebInputEvent::ScopedWebInputEvent>::Write(
|
| + base::Pickle* m,
|
| + const param_type& p) {
|
| bool valid_web_event = !!p;
|
| WriteParam(m, valid_web_event);
|
| if (valid_web_event)
|
| WriteParam(m, static_cast<WebInputEventPointer>(p.get()));
|
| }
|
|
|
| -bool ParamTraits<ui::ScopedWebInputEvent>::Read(const base::Pickle* m,
|
| - base::PickleIterator* iter,
|
| - param_type* p) {
|
| +bool ParamTraits<blink::CoalescedWebInputEvent::ScopedWebInputEvent>::Read(
|
| + const base::Pickle* m,
|
| + base::PickleIterator* iter,
|
| + param_type* p) {
|
| bool valid_web_event = false;
|
| WebInputEventPointer web_event_pointer = NULL;
|
| if (!ReadParam(m, iter, &valid_web_event) ||
|
| @@ -59,8 +62,9 @@ bool ParamTraits<ui::ScopedWebInputEvent>::Read(const base::Pickle* m,
|
| return true;
|
| }
|
|
|
| -void ParamTraits<ui::ScopedWebInputEvent>::Log(const param_type& p,
|
| - std::string* l) {
|
| +void ParamTraits<blink::CoalescedWebInputEvent::ScopedWebInputEvent>::Log(
|
| + const param_type& p,
|
| + std::string* l) {
|
| LogParam(static_cast<WebInputEventPointer>(p.get()), l);
|
| }
|
|
|
|
|