Suppressed MEs for gestures from cancelled PEs

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 "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 1919 matching lines @@
 }
 
 bool EventSender::IsFlinging() const {
   return view()->isFlinging();
 }
 
 void EventSender::GestureScrollFirstPoint(int x, int y) {
   current_gesture_location_ = WebPoint(x, y);
 }
 
-bool EventSender::GetMovedBeyondSlopRegionArg(gin::Arguments* args) {
-  std::string arg;
-  if (args->PeekNext().IsEmpty())
-    return false;
-
-  if(args->PeekNext()->IsString() && args->GetNext(&arg)) {
-    if (arg == "movedBeyondSlopRegion")
-      return true;
-  }
-
-  args->ThrowError();
-  return false;
-}
-
 void EventSender::TouchStart(gin::Arguments* args) {
-  SendCurrentTouchEvent(WebInputEvent::TouchStart,
-                        GetMovedBeyondSlopRegionArg(args));
+  SendCurrentTouchEvent(WebInputEvent::TouchStart, args);
 }
 
 void EventSender::TouchMove(gin::Arguments* args) {
-  SendCurrentTouchEvent(WebInputEvent::TouchMove,
-                        GetMovedBeyondSlopRegionArg(args));
+  SendCurrentTouchEvent(WebInputEvent::TouchMove, args);
 }
 
 void EventSender::TouchCancel(gin::Arguments* args) {
-  SendCurrentTouchEvent(WebInputEvent::TouchCancel,
-                        GetMovedBeyondSlopRegionArg(args));
+  SendCurrentTouchEvent(WebInputEvent::TouchCancel, args);
 }
 
 void EventSender::TouchEnd(gin::Arguments* args) {
-  SendCurrentTouchEvent(WebInputEvent::TouchEnd,
-                        GetMovedBeyondSlopRegionArg(args));
+  SendCurrentTouchEvent(WebInputEvent::TouchEnd, args);
 }
 
 void EventSender::NotifyStartOfTouchScroll() {
   WebTouchEvent event;
   event.type = WebInputEvent::TouchScrollStarted;
   HandleInputEventOnViewOrPopup(event);
 }
 
 void EventSender::LeapForward(int milliseconds) {
   if (is_drag_mode_ &&
@@ skipping 227 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,
-                                        bool movedBeyondSlopRegion) {
+                                        gin::Arguments* args) {
+  bool moved_beyond_slop_region;
+  uint32_t unique_touch_event_id;
+  GetOptionalTouchArgs(args, moved_beyond_slop_region, unique_touch_event_id);
+
   DCHECK_GT(static_cast<unsigned>(WebTouchEvent::touchesLengthCap),
             touch_points_.size());
   if (force_layout_on_events_)
     view()->updateAllLifecyclePhases();
 
   WebTouchEvent touch_event;
   touch_event.type = type;
   touch_event.modifiers = touch_modifiers_;
   touch_event.dispatchType = touch_cancelable_
                                  ? WebInputEvent::Blocking
                                  : WebInputEvent::EventNonBlocking;
   touch_event.timeStampSeconds = GetCurrentEventTimeSec();
-  touch_event.movedBeyondSlopRegion = movedBeyondSlopRegion;
+  touch_event.movedBeyondSlopRegion = moved_beyond_slop_region;
+  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) {
       touch_points_.erase(touch_points_.begin() + i);
@@ skipping 177 matching lines @@
       event.y = y;
       event.data.showPress.width = width;
       event.data.showPress.height = height;
       break;
     }
     case WebInputEvent::GestureTapCancel:
       event.x = x;
       event.y = y;
       break;
     case WebInputEvent::GestureLongPress:
-      event.x = x;
-      event.y = y;
-      if (!args->PeekNext().IsEmpty()) {
-        float width;
-        if (!args->GetNext(&width)) {
-          args->ThrowError();
-          return;
-        }
-        event.data.longPress.width = width;
-        if (!args->PeekNext().IsEmpty()) {
-          float height;
-          if (!args->GetNext(&height)) {
-            args->ThrowError();
-            return;
-          }
-          event.data.longPress.height = height;
-        }
-      }
-      break;
     case WebInputEvent::GestureLongTap:
       event.x = x;
       event.y = y;
       if (!args->PeekNext().IsEmpty()) {
         float width;
         if (!args->GetNext(&width)) {
           args->ThrowError();
           return;
         }
         event.data.longPress.width = width;
@@ skipping 24 matching lines @@
             return;
           }
           event.data.twoFingerTap.firstFingerHeight = first_finger_height;
         }
       }
       break;
     default:
       NOTREACHED();
   }
 
+  event.uniqueTouchEventId = GetUniqueTouchEventId(args);
+
   event.globalX = event.x;
   event.globalY = event.y;
   event.timeStampSeconds = GetCurrentEventTimeSec();
 
   if (force_layout_on_events_)
     view()->updateAllLifecyclePhases();
 
   WebInputEventResult result = HandleInputEventOnViewOrPopup(event);
 
   // Long press might start a drag drop session. Complete it if so.
@@ skipping 316 matching lines @@
 
 const blink::WebView* EventSender::view() const {
   return web_test_proxy_base_->web_view();
 }
 
 blink::WebView* EventSender::view() {
   return web_test_proxy_base_->web_view();
 }
 
 }  // namespace test_runner