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 286 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
297 for (unsigned i = 0; i < web_event->touchesLength; ++i) { | 297 for (unsigned i = 0; i < web_event->touchesLength; ++i) { |
298 blink::WebTouchPoint* iter = web_event->touches + i; | 298 blink::WebTouchPoint* iter = web_event->touches + i; |
299 if (iter != point) | 299 if (iter != point) |
300 iter->state = blink::WebTouchPoint::StateStationary; | 300 iter->state = blink::WebTouchPoint::StateStationary; |
301 } | 301 } |
302 | 302 |
303 // Update the type of the touch event. | 303 // Update the type of the touch event. |
304 WebTouchEventTraits::ResetType(TouchEventTypeFromEvent(event), | 304 WebTouchEventTraits::ResetType(TouchEventTypeFromEvent(event), |
305 event.time_stamp().InSecondsF(), | 305 event.time_stamp().InSecondsF(), |
306 web_event); | 306 web_event); |
| 307 web_event->causesScrollingIfUncanceled = event.causes_scrolling(); |
307 web_event->modifiers = EventFlagsToWebEventModifiers(event.flags()); | 308 web_event->modifiers = EventFlagsToWebEventModifiers(event.flags()); |
308 | 309 |
309 return point; | 310 return point; |
310 } | 311 } |
311 | 312 |
312 } // namespace content | 313 } // namespace content |
OLD | NEW |