Index: content/browser/renderer_host/input/touch_event_queue.cc |
diff --git a/content/browser/renderer_host/input/touch_event_queue.cc b/content/browser/renderer_host/input/touch_event_queue.cc |
index f7707da4d904e75ab7c7e1f3821f0509e4e07262..946dd4283a8ce02f4df76124ac15a66da991bb1f 100644 |
--- a/content/browser/renderer_host/input/touch_event_queue.cc |
+++ b/content/browser/renderer_host/input/touch_event_queue.cc |
@@ -192,14 +192,11 @@ class TouchEventQueue::TouchTimeoutHandler { |
// has exceeded the slop region, removing duplicated slop determination logic. |
class TouchEventQueue::TouchMoveSlopSuppressor { |
public: |
- TouchMoveSlopSuppressor(double slop_suppression_length_dips, |
- double slop_suppression_region_includes_boundary) |
+ TouchMoveSlopSuppressor(double slop_suppression_length_dips) |
: slop_suppression_length_dips_squared_(0), |
suppressing_touchmoves_(false) { |
if (slop_suppression_length_dips) { |
- slop_suppression_length_dips += slop_suppression_region_includes_boundary |
- ? kSlopEpsilon |
- : -kSlopEpsilon; |
+ slop_suppression_length_dips += kSlopEpsilon; |
slop_suppression_length_dips_squared_ = |
slop_suppression_length_dips * slop_suppression_length_dips; |
} |
@@ -336,7 +333,6 @@ class CoalescedWebTouchEvent { |
TouchEventQueue::Config::Config() |
: touchmove_slop_suppression_length_dips(0), |
- touchmove_slop_suppression_region_includes_boundary(true), |
touch_scrolling_mode(TOUCH_SCROLLING_MODE_DEFAULT), |
touch_ack_timeout_delay(base::TimeDelta::FromMilliseconds(200)), |
touch_ack_timeout_supported(false) { |
@@ -350,8 +346,7 @@ TouchEventQueue::TouchEventQueue(TouchEventQueueClient* client, |
touch_filtering_state_(TOUCH_FILTERING_STATE_DEFAULT), |
ack_timeout_enabled_(config.touch_ack_timeout_supported), |
touchmove_slop_suppressor_(new TouchMoveSlopSuppressor( |
- config.touchmove_slop_suppression_length_dips, |
- config.touchmove_slop_suppression_region_includes_boundary)), |
+ config.touchmove_slop_suppression_length_dips)), |
send_touch_events_async_(false), |
needs_async_touchmove_for_outer_slop_region_(false), |
last_sent_touch_timestamp_sec_(0), |