| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 // MSVC++ requires this to be set before any other includes to get M_PI. | 5 // MSVC++ requires this to be set before any other includes to get M_PI. |
| 6 #define _USE_MATH_DEFINES | 6 #define _USE_MATH_DEFINES |
| 7 | 7 |
| 8 #include "ui/events/blink/blink_event_util.h" | 8 #include "ui/events/blink/blink_event_util.h" |
| 9 | 9 |
| 10 #include <stddef.h> | 10 #include <stddef.h> |
| (...skipping 265 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 276 float unaccelerated_y = | 276 float unaccelerated_y = |
| 277 GetUnacceleratedDelta(event->delta_y, event->acceleration_ratio_y) + | 277 GetUnacceleratedDelta(event->delta_y, event->acceleration_ratio_y) + |
| 278 GetUnacceleratedDelta(event_to_coalesce.delta_y, | 278 GetUnacceleratedDelta(event_to_coalesce.delta_y, |
| 279 event_to_coalesce.acceleration_ratio_y); | 279 event_to_coalesce.acceleration_ratio_y); |
| 280 float old_deltaX = event->delta_x; | 280 float old_deltaX = event->delta_x; |
| 281 float old_deltaY = event->delta_y; | 281 float old_deltaY = event->delta_y; |
| 282 float old_wheelTicksX = event->wheel_ticks_x; | 282 float old_wheelTicksX = event->wheel_ticks_x; |
| 283 float old_wheelTicksY = event->wheel_ticks_y; | 283 float old_wheelTicksY = event->wheel_ticks_y; |
| 284 float old_movementX = event->movement_x; | 284 float old_movementX = event->movement_x; |
| 285 float old_movementY = event->movement_y; | 285 float old_movementY = event->movement_y; |
| 286 WebInputEvent::DispatchType old_dispatch_type = event->dispatch_type; |
| 286 *event = event_to_coalesce; | 287 *event = event_to_coalesce; |
| 287 event->delta_x += old_deltaX; | 288 event->delta_x += old_deltaX; |
| 288 event->delta_y += old_deltaY; | 289 event->delta_y += old_deltaY; |
| 289 event->wheel_ticks_x += old_wheelTicksX; | 290 event->wheel_ticks_x += old_wheelTicksX; |
| 290 event->wheel_ticks_y += old_wheelTicksY; | 291 event->wheel_ticks_y += old_wheelTicksY; |
| 291 event->movement_x += old_movementX; | 292 event->movement_x += old_movementX; |
| 292 event->movement_y += old_movementY; | 293 event->movement_y += old_movementY; |
| 293 event->acceleration_ratio_x = | 294 event->acceleration_ratio_x = |
| 294 GetAccelerationRatio(event->delta_x, unaccelerated_x); | 295 GetAccelerationRatio(event->delta_x, unaccelerated_x); |
| 295 event->acceleration_ratio_y = | 296 event->acceleration_ratio_y = |
| 296 GetAccelerationRatio(event->delta_y, unaccelerated_y); | 297 GetAccelerationRatio(event->delta_y, unaccelerated_y); |
| 298 event->dispatch_type = |
| 299 MergeDispatchTypes(old_dispatch_type, event_to_coalesce.dispatch_type); |
| 297 } | 300 } |
| 298 | 301 |
| 299 bool CanCoalesce(const WebTouchEvent& event_to_coalesce, | 302 bool CanCoalesce(const WebTouchEvent& event_to_coalesce, |
| 300 const WebTouchEvent& event) { | 303 const WebTouchEvent& event) { |
| 301 if (event.GetType() != event_to_coalesce.GetType() || | 304 if (event.GetType() != event_to_coalesce.GetType() || |
| 302 event.GetType() != WebInputEvent::kTouchMove || | 305 event.GetType() != WebInputEvent::kTouchMove || |
| 303 event.GetModifiers() != event_to_coalesce.GetModifiers() || | 306 event.GetModifiers() != event_to_coalesce.GetModifiers() || |
| 304 event.touches_length != event_to_coalesce.touches_length || | 307 event.touches_length != event_to_coalesce.touches_length || |
| 305 event.touches_length > WebTouchEvent::kTouchesLengthCap) | 308 event.touches_length > WebTouchEvent::kTouchesLengthCap) |
| 306 return false; | 309 return false; |
| (...skipping 679 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 986 switch (type) { | 989 switch (type) { |
| 987 case blink::WebGestureEvent::kGestureScrollUpdate: | 990 case blink::WebGestureEvent::kGestureScrollUpdate: |
| 988 case blink::WebGestureEvent::kGesturePinchUpdate: | 991 case blink::WebGestureEvent::kGesturePinchUpdate: |
| 989 return true; | 992 return true; |
| 990 default: | 993 default: |
| 991 return false; | 994 return false; |
| 992 } | 995 } |
| 993 } | 996 } |
| 994 | 997 |
| 995 } // namespace ui | 998 } // namespace ui |
| OLD | NEW |