Move touch slop suppression to TouchEventManager

components/test_runner/event_sender.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/test_runner/event_sender.h"
 
 #include <stddef.h>
 
 #include <memory>
 
@@ skipping 2218 matching lines @@
 
 double EventSender::GetCurrentEventTimeSec() {
   return (base::TimeTicks::Now() - base::TimeTicks()).InSecondsF() +
          time_offset_ms_ / 1000.0;
 }
 
 void EventSender::DoLeapForward(int milliseconds) {
   time_offset_ms_ += milliseconds;
 }
 
-void EventSender::GetOptionalTouchArgs(gin::Arguments* args,
-                                       bool& moved_beyond_slop_region,
-                                       uint32_t& unique_touch_event_id) {
-  moved_beyond_slop_region = false;
-  if(!args->PeekNext().IsEmpty() && args->PeekNext()->IsString()) {
-    std::string arg;
-    if (args->GetNext(&arg) && arg == "movedBeyondSlopRegion")
-      moved_beyond_slop_region = true;
-    else
-      args->ThrowError();
-  }
-
-  unique_touch_event_id = GetUniqueTouchEventId(args);
-  return;
-}
-
 uint32_t EventSender::GetUniqueTouchEventId(gin::Arguments* args) {
   uint32_t unique_touch_event_id;
   if(!args->PeekNext().IsEmpty() && args->GetNext(&unique_touch_event_id))
     return unique_touch_event_id;
 
   return 0;
 }
 
 void EventSender::SendCurrentTouchEvent(WebInputEvent::Type type,
                                         gin::Arguments* args) {
-  bool moved_beyond_slop_region;
-  uint32_t unique_touch_event_id;
-  GetOptionalTouchArgs(args, moved_beyond_slop_region, unique_touch_event_id);
+  uint32_t unique_touch_event_id = GetUniqueTouchEventId(args);
 
   DCHECK_GT(static_cast<unsigned>(WebTouchEvent::kTouchesLengthCap),
             touch_points_.size());
   if (force_layout_on_events_)
     widget()->updateAllLifecyclePhases();
 
   WebTouchEvent touch_event(type, touch_modifiers_, GetCurrentEventTimeSec());
   touch_event.dispatchType = touch_cancelable_
                                  ? WebInputEvent::Blocking
                                  : WebInputEvent::EventNonBlocking;
-  touch_event.movedBeyondSlopRegion = moved_beyond_slop_region;
+  touch_event.movedBeyondSlopRegion = true;
   touch_event.uniqueTouchEventId = unique_touch_event_id;
   touch_event.touchesLength = touch_points_.size();
   for (size_t i = 0; i < touch_points_.size(); ++i)
     touch_event.touches[i] = touch_points_[i];
   HandleInputEventOnViewOrPopup(touch_event);
 
   for (size_t i = 0; i < touch_points_.size(); ++i) {
     WebTouchPoint* touch_point = &touch_points_[i];
     if (touch_point->state == WebTouchPoint::StateReleased
         || touch_point->state == WebTouchPoint::StateCancelled) {
@@ skipping 612 matching lines @@
   return view()->mainFrame()->toWebLocalFrame()->frameWidget();
 }
 
 std::unique_ptr<WebInputEvent> EventSender::TransformScreenToWidgetCoordinates(
     const WebInputEvent& event) {
   return delegate()->TransformScreenToWidgetCoordinates(
       web_widget_test_proxy_base_, event);
 }
 
 }  // namespace test_runner