| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/browser/renderer_host/ui_events_helper.h" | 5 #include "content/browser/renderer_host/ui_events_helper.h" |
| 6 | 6 |
| 7 #include "content/browser/renderer_host/input/web_input_event_util.h" | 7 #include "content/browser/renderer_host/input/web_input_event_util.h" |
| 8 #include "content/common/input/web_touch_event_traits.h" | 8 #include "content/common/input/web_touch_event_traits.h" |
| 9 #include "third_party/WebKit/public/web/WebInputEvent.h" | 9 #include "third_party/WebKit/public/web/WebInputEvent.h" |
| 10 #include "ui/events/event.h" | 10 #include "ui/events/event.h" |
| (...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 177 gesture_event.type = blink::WebInputEvent::GestureScrollBegin; | 177 gesture_event.type = blink::WebInputEvent::GestureScrollBegin; |
| 178 gesture_event.data.scrollBegin.deltaXHint = | 178 gesture_event.data.scrollBegin.deltaXHint = |
| 179 event.details().scroll_x_hint(); | 179 event.details().scroll_x_hint(); |
| 180 gesture_event.data.scrollBegin.deltaYHint = | 180 gesture_event.data.scrollBegin.deltaYHint = |
| 181 event.details().scroll_y_hint(); | 181 event.details().scroll_y_hint(); |
| 182 break; | 182 break; |
| 183 case ui::ET_GESTURE_SCROLL_UPDATE: | 183 case ui::ET_GESTURE_SCROLL_UPDATE: |
| 184 gesture_event.type = blink::WebInputEvent::GestureScrollUpdate; | 184 gesture_event.type = blink::WebInputEvent::GestureScrollUpdate; |
| 185 gesture_event.data.scrollUpdate.deltaX = event.details().scroll_x(); | 185 gesture_event.data.scrollUpdate.deltaX = event.details().scroll_x(); |
| 186 gesture_event.data.scrollUpdate.deltaY = event.details().scroll_y(); | 186 gesture_event.data.scrollUpdate.deltaY = event.details().scroll_y(); |
| 187 gesture.data.scrollUpdate.isFirstUpdate = |
| 188 data.details.is_first_scroll_update(); |
| 187 break; | 189 break; |
| 188 case ui::ET_GESTURE_SCROLL_END: | 190 case ui::ET_GESTURE_SCROLL_END: |
| 189 gesture_event.type = blink::WebInputEvent::GestureScrollEnd; | 191 gesture_event.type = blink::WebInputEvent::GestureScrollEnd; |
| 190 break; | 192 break; |
| 191 case ui::ET_GESTURE_PINCH_BEGIN: | 193 case ui::ET_GESTURE_PINCH_BEGIN: |
| 192 gesture_event.type = blink::WebInputEvent::GesturePinchBegin; | 194 gesture_event.type = blink::WebInputEvent::GesturePinchBegin; |
| 193 break; | 195 break; |
| 194 case ui::ET_GESTURE_PINCH_UPDATE: | 196 case ui::ET_GESTURE_PINCH_UPDATE: |
| 195 gesture_event.type = blink::WebInputEvent::GesturePinchUpdate; | 197 gesture_event.type = blink::WebInputEvent::GesturePinchUpdate; |
| 196 gesture_event.data.pinchUpdate.scale = event.details().scale(); | 198 gesture_event.data.pinchUpdate.scale = event.details().scale(); |
| (...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 303 // Update the type of the touch event. | 305 // Update the type of the touch event. |
| 304 WebTouchEventTraits::ResetType(TouchEventTypeFromEvent(event), | 306 WebTouchEventTraits::ResetType(TouchEventTypeFromEvent(event), |
| 305 event.time_stamp().InSecondsF(), | 307 event.time_stamp().InSecondsF(), |
| 306 web_event); | 308 web_event); |
| 307 web_event->modifiers = EventFlagsToWebEventModifiers(event.flags()); | 309 web_event->modifiers = EventFlagsToWebEventModifiers(event.flags()); |
| 308 | 310 |
| 309 return point; | 311 return point; |
| 310 } | 312 } |
| 311 | 313 |
| 312 } // namespace content | 314 } // namespace content |
| OLD | NEW |