OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 #include "content/common/input/input_param_traits.h" | 5 #include "content/common/input/input_param_traits.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 | 8 |
9 #include "content/common/content_param_traits.h" | 9 #include "content/common/content_param_traits.h" |
10 #include "content/common/input/synthetic_pinch_gesture_params.h" | 10 #include "content/common/input/synthetic_pinch_gesture_params.h" |
(...skipping 10 matching lines...) Expand all Loading... |
21 const base::Pickle* m, | 21 const base::Pickle* m, |
22 base::PickleIterator* iter) { | 22 base::PickleIterator* iter) { |
23 std::unique_ptr<GestureType> gesture_params(new GestureType); | 23 std::unique_ptr<GestureType> gesture_params(new GestureType); |
24 if (!ReadParam(m, iter, gesture_params.get())) | 24 if (!ReadParam(m, iter, gesture_params.get())) |
25 return std::unique_ptr<content::SyntheticGestureParams>(); | 25 return std::unique_ptr<content::SyntheticGestureParams>(); |
26 | 26 |
27 return std::move(gesture_params); | 27 return std::move(gesture_params); |
28 } | 28 } |
29 } // namespace | 29 } // namespace |
30 | 30 |
31 void ParamTraits<ui::ScopedWebInputEvent>::GetSize(base::PickleSizer* s, | 31 void ParamTraits<blink::CoalescedWebInputEvent::ScopedWebInputEvent>::GetSize( |
32 const param_type& p) { | 32 base::PickleSizer* s, |
| 33 const param_type& p) { |
33 bool valid_web_event = !!p; | 34 bool valid_web_event = !!p; |
34 GetParamSize(s, valid_web_event); | 35 GetParamSize(s, valid_web_event); |
35 if (valid_web_event) | 36 if (valid_web_event) |
36 GetParamSize(s, static_cast<WebInputEventPointer>(p.get())); | 37 GetParamSize(s, static_cast<WebInputEventPointer>(p.get())); |
37 } | 38 } |
38 | 39 |
39 void ParamTraits<ui::ScopedWebInputEvent>::Write(base::Pickle* m, | 40 void ParamTraits<blink::CoalescedWebInputEvent::ScopedWebInputEvent>::Write( |
40 const param_type& p) { | 41 base::Pickle* m, |
| 42 const param_type& p) { |
41 bool valid_web_event = !!p; | 43 bool valid_web_event = !!p; |
42 WriteParam(m, valid_web_event); | 44 WriteParam(m, valid_web_event); |
43 if (valid_web_event) | 45 if (valid_web_event) |
44 WriteParam(m, static_cast<WebInputEventPointer>(p.get())); | 46 WriteParam(m, static_cast<WebInputEventPointer>(p.get())); |
45 } | 47 } |
46 | 48 |
47 bool ParamTraits<ui::ScopedWebInputEvent>::Read(const base::Pickle* m, | 49 bool ParamTraits<blink::CoalescedWebInputEvent::ScopedWebInputEvent>::Read( |
48 base::PickleIterator* iter, | 50 const base::Pickle* m, |
49 param_type* p) { | 51 base::PickleIterator* iter, |
| 52 param_type* p) { |
50 bool valid_web_event = false; | 53 bool valid_web_event = false; |
51 WebInputEventPointer web_event_pointer = NULL; | 54 WebInputEventPointer web_event_pointer = NULL; |
52 if (!ReadParam(m, iter, &valid_web_event) || | 55 if (!ReadParam(m, iter, &valid_web_event) || |
53 !valid_web_event || | 56 !valid_web_event || |
54 !ReadParam(m, iter, &web_event_pointer) || | 57 !ReadParam(m, iter, &web_event_pointer) || |
55 !web_event_pointer) | 58 !web_event_pointer) |
56 return false; | 59 return false; |
57 | 60 |
58 (*p) = ui::WebInputEventTraits::Clone(*web_event_pointer); | 61 (*p) = ui::WebInputEventTraits::Clone(*web_event_pointer); |
59 return true; | 62 return true; |
60 } | 63 } |
61 | 64 |
62 void ParamTraits<ui::ScopedWebInputEvent>::Log(const param_type& p, | 65 void ParamTraits<blink::CoalescedWebInputEvent::ScopedWebInputEvent>::Log( |
63 std::string* l) { | 66 const param_type& p, |
| 67 std::string* l) { |
64 LogParam(static_cast<WebInputEventPointer>(p.get()), l); | 68 LogParam(static_cast<WebInputEventPointer>(p.get()), l); |
65 } | 69 } |
66 | 70 |
67 void ParamTraits<content::SyntheticGesturePacket>::Write(base::Pickle* m, | 71 void ParamTraits<content::SyntheticGesturePacket>::Write(base::Pickle* m, |
68 const param_type& p) { | 72 const param_type& p) { |
69 DCHECK(p.gesture_params()); | 73 DCHECK(p.gesture_params()); |
70 WriteParam(m, p.gesture_params()->GetGestureType()); | 74 WriteParam(m, p.gesture_params()->GetGestureType()); |
71 switch (p.gesture_params()->GetGestureType()) { | 75 switch (p.gesture_params()->GetGestureType()) { |
72 case content::SyntheticGestureParams::SMOOTH_SCROLL_GESTURE: | 76 case content::SyntheticGestureParams::SMOOTH_SCROLL_GESTURE: |
73 WriteParam(m, *content::SyntheticSmoothScrollGestureParams::Cast( | 77 WriteParam(m, *content::SyntheticSmoothScrollGestureParams::Cast( |
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
157 l); | 161 l); |
158 break; | 162 break; |
159 case content::SyntheticGestureParams::POINTER_ACTION: | 163 case content::SyntheticGestureParams::POINTER_ACTION: |
160 LogParam(*content::SyntheticPointerActionParams::Cast(p.gesture_params()), | 164 LogParam(*content::SyntheticPointerActionParams::Cast(p.gesture_params()), |
161 l); | 165 l); |
162 break; | 166 break; |
163 } | 167 } |
164 } | 168 } |
165 | 169 |
166 } // namespace IPC | 170 } // namespace IPC |
OLD | NEW |