| 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" |
| 11 #include "content/common/input/synthetic_pointer_action_params.h" | 11 #include "content/common/input/synthetic_pointer_action_params.h" |
| 12 #include "content/common/input/synthetic_smooth_drag_gesture_params.h" | 12 #include "content/common/input/synthetic_smooth_drag_gesture_params.h" |
| 13 #include "content/common/input/synthetic_smooth_scroll_gesture_params.h" | 13 #include "content/common/input/synthetic_smooth_scroll_gesture_params.h" |
| 14 #include "content/common/input/web_input_event_traits.h" | |
| 15 #include "content/common/input_messages.h" | 14 #include "content/common/input_messages.h" |
| 15 #include "ui/events/blink/web_input_event_traits.h" |
| 16 | 16 |
| 17 namespace IPC { | 17 namespace IPC { |
| 18 namespace { | 18 namespace { |
| 19 template <typename GestureType> | 19 template <typename GestureType> |
| 20 std::unique_ptr<content::SyntheticGestureParams> ReadGestureParams( | 20 std::unique_ptr<content::SyntheticGestureParams> ReadGestureParams( |
| 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<content::ScopedWebInputEvent>::GetSize(base::PickleSizer* s, | 31 void ParamTraits<ui::ScopedWebInputEvent>::GetSize(base::PickleSizer* s, |
| 32 const param_type& p) { | 32 const param_type& p) { |
| 33 bool valid_web_event = !!p; | 33 bool valid_web_event = !!p; |
| 34 GetParamSize(s, valid_web_event); | 34 GetParamSize(s, valid_web_event); |
| 35 if (valid_web_event) | 35 if (valid_web_event) |
| 36 GetParamSize(s, static_cast<WebInputEventPointer>(p.get())); | 36 GetParamSize(s, static_cast<WebInputEventPointer>(p.get())); |
| 37 } | 37 } |
| 38 | 38 |
| 39 void ParamTraits<content::ScopedWebInputEvent>::Write(base::Pickle* m, | 39 void ParamTraits<ui::ScopedWebInputEvent>::Write(base::Pickle* m, |
| 40 const param_type& p) { | 40 const param_type& p) { |
| 41 bool valid_web_event = !!p; | 41 bool valid_web_event = !!p; |
| 42 WriteParam(m, valid_web_event); | 42 WriteParam(m, valid_web_event); |
| 43 if (valid_web_event) | 43 if (valid_web_event) |
| 44 WriteParam(m, static_cast<WebInputEventPointer>(p.get())); | 44 WriteParam(m, static_cast<WebInputEventPointer>(p.get())); |
| 45 } | 45 } |
| 46 | 46 |
| 47 bool ParamTraits<content::ScopedWebInputEvent>::Read(const base::Pickle* m, | 47 bool ParamTraits<ui::ScopedWebInputEvent>::Read(const base::Pickle* m, |
| 48 base::PickleIterator* iter, | 48 base::PickleIterator* iter, |
| 49 param_type* p) { | 49 param_type* p) { |
| 50 bool valid_web_event = false; | 50 bool valid_web_event = false; |
| 51 WebInputEventPointer web_event_pointer = NULL; | 51 WebInputEventPointer web_event_pointer = NULL; |
| 52 if (!ReadParam(m, iter, &valid_web_event) || | 52 if (!ReadParam(m, iter, &valid_web_event) || |
| 53 !valid_web_event || | 53 !valid_web_event || |
| 54 !ReadParam(m, iter, &web_event_pointer) || | 54 !ReadParam(m, iter, &web_event_pointer) || |
| 55 !web_event_pointer) | 55 !web_event_pointer) |
| 56 return false; | 56 return false; |
| 57 | 57 |
| 58 (*p) = content::WebInputEventTraits::Clone(*web_event_pointer); | 58 (*p) = ui::WebInputEventTraits::Clone(*web_event_pointer); |
| 59 return true; | 59 return true; |
| 60 } | 60 } |
| 61 | 61 |
| 62 void ParamTraits<content::ScopedWebInputEvent>::Log(const param_type& p, | 62 void ParamTraits<ui::ScopedWebInputEvent>::Log(const param_type& p, |
| 63 std::string* l) { | 63 std::string* l) { |
| 64 LogParam(static_cast<WebInputEventPointer>(p.get()), l); | 64 LogParam(static_cast<WebInputEventPointer>(p.get()), l); |
| 65 } | 65 } |
| 66 | 66 |
| 67 void ParamTraits<content::SyntheticGesturePacket>::Write(base::Pickle* m, | 67 void ParamTraits<content::SyntheticGesturePacket>::Write(base::Pickle* m, |
| 68 const param_type& p) { | 68 const param_type& p) { |
| 69 DCHECK(p.gesture_params()); | 69 DCHECK(p.gesture_params()); |
| 70 WriteParam(m, p.gesture_params()->GetGestureType()); | 70 WriteParam(m, p.gesture_params()->GetGestureType()); |
| 71 switch (p.gesture_params()->GetGestureType()) { | 71 switch (p.gesture_params()->GetGestureType()) { |
| 72 case content::SyntheticGestureParams::SMOOTH_SCROLL_GESTURE: | 72 case content::SyntheticGestureParams::SMOOTH_SCROLL_GESTURE: |
| (...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 157 l); | 157 l); |
| 158 break; | 158 break; |
| 159 case content::SyntheticGestureParams::POINTER_ACTION: | 159 case content::SyntheticGestureParams::POINTER_ACTION: |
| 160 LogParam(*content::SyntheticPointerActionParams::Cast(p.gesture_params()), | 160 LogParam(*content::SyntheticPointerActionParams::Cast(p.gesture_params()), |
| 161 l); | 161 l); |
| 162 break; | 162 break; |
| 163 } | 163 } |
| 164 } | 164 } |
| 165 | 165 |
| 166 } // namespace IPC | 166 } // namespace IPC |
| OLD | NEW |