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 245 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
256 } | 256 } |
257 | 257 |
258 bool CanCoalesce(const WebMouseWheelEvent& event_to_coalesce, | 258 bool CanCoalesce(const WebMouseWheelEvent& event_to_coalesce, |
259 const WebMouseWheelEvent& event) { | 259 const WebMouseWheelEvent& event) { |
260 return event.GetModifiers() == event_to_coalesce.GetModifiers() && | 260 return event.GetModifiers() == event_to_coalesce.GetModifiers() && |
261 event.scroll_by_page == event_to_coalesce.scroll_by_page && | 261 event.scroll_by_page == event_to_coalesce.scroll_by_page && |
262 event.phase == event_to_coalesce.phase && | 262 event.phase == event_to_coalesce.phase && |
263 event.momentum_phase == event_to_coalesce.momentum_phase && | 263 event.momentum_phase == event_to_coalesce.momentum_phase && |
264 event.resending_plugin_id == event_to_coalesce.resending_plugin_id && | 264 event.resending_plugin_id == event_to_coalesce.resending_plugin_id && |
265 event.has_precise_scrolling_deltas == | 265 event.has_precise_scrolling_deltas == |
266 event_to_coalesce.has_precise_scrolling_deltas; | 266 event_to_coalesce.has_precise_scrolling_deltas && |
267 event.dispatch_type == event_to_coalesce.dispatch_type; | |
dtapuska
2017/06/16 17:36:09
This seems wrong.
For touch we allow a cancellabl
sahel
2017/06/20 19:22:33
Done.
| |
267 } | 268 } |
268 | 269 |
269 void Coalesce(const WebMouseWheelEvent& event_to_coalesce, | 270 void Coalesce(const WebMouseWheelEvent& event_to_coalesce, |
270 WebMouseWheelEvent* event) { | 271 WebMouseWheelEvent* event) { |
271 DCHECK(CanCoalesce(event_to_coalesce, *event)); | 272 DCHECK(CanCoalesce(event_to_coalesce, *event)); |
272 float unaccelerated_x = | 273 float unaccelerated_x = |
273 GetUnacceleratedDelta(event->delta_x, event->acceleration_ratio_x) + | 274 GetUnacceleratedDelta(event->delta_x, event->acceleration_ratio_x) + |
274 GetUnacceleratedDelta(event_to_coalesce.delta_x, | 275 GetUnacceleratedDelta(event_to_coalesce.delta_x, |
275 event_to_coalesce.acceleration_ratio_x); | 276 event_to_coalesce.acceleration_ratio_x); |
276 float unaccelerated_y = | 277 float unaccelerated_y = |
(...skipping 706 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
983 switch (type) { | 984 switch (type) { |
984 case blink::WebGestureEvent::kGestureScrollUpdate: | 985 case blink::WebGestureEvent::kGestureScrollUpdate: |
985 case blink::WebGestureEvent::kGesturePinchUpdate: | 986 case blink::WebGestureEvent::kGesturePinchUpdate: |
986 return true; | 987 return true; |
987 default: | 988 default: |
988 return false; | 989 return false; |
989 } | 990 } |
990 } | 991 } |
991 | 992 |
992 } // namespace ui | 993 } // namespace ui |
OLD | NEW |