[ChromeDriver] Fix pointer action locations

Fix how pointer event locations are calculated in Perform Actions
command, in particular, fixing how relative pointer moves are handled.
This fixes all failures in WPT test perform_actions/pointer.py.

Bug: chromedriver:1897
Change-Id: If0bd79399e9376fe885ef9c26f20d775a4c7d6c3
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1507313Reviewed-by: Lan Wei <lanwei@chromium.org>
Commit-Queue: John Chen <johnchen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#638744}

chrome/test/chromedriver/chrome/ui_events.cc

@@ -23,6 +23,7 @@ MouseEvent::MouseEvent(MouseEventType type,
       modifiers(modifiers),
       buttons(buttons),
       click_count(click_count),
+      origin(kViewPort),
       element_id(std::string()),
       pointer_type(kMouse) {}
 
@@ -34,12 +35,14 @@ TouchEvent::TouchEvent(TouchEventType type, int x, int y)
     : type(type),
       x(x),
       y(y),
+      origin(kViewPort),
       radiusX(1.0),
       radiusY(1.0),
       rotationAngle(0.0),
       force(1.0),
       id(0),
-      element_id(std::string()) {}
+      element_id(std::string()),
+      dispatch(true) {}
 
 TouchEvent::TouchEvent(const TouchEvent& other) = default;
 

chrome/test/chromedriver/chrome/ui_events.h

@@ -32,6 +32,9 @@ enum MouseButton {
 // Specifies the event's pointer type.
 enum PointerType { kMouse = 0, kPen };
 
+// Specifies the origin of pointer location.
+enum OriginType { kViewPort, kPointer, kElement };
+
 struct MouseEvent {
   MouseEvent(MouseEventType type,
              MouseButton button,
@@ -51,6 +54,7 @@ struct MouseEvent {
   int buttons;
   // |click_count| should not be negative.
   int click_count;
+  OriginType origin;
   std::string element_id;
   PointerType pointer_type;
 };
@@ -74,12 +78,14 @@ struct TouchEvent {
   TouchEventType type;
   int x;
   int y;
+  OriginType origin;
   double radiusX;
   double radiusY;
   double rotationAngle;
   double force;
   int id;
   std::string element_id;
+  bool dispatch;
 };
 
 // Specifies the type of the keyboard event.

chrome/test/chromedriver/window_commands.cc

@@ -1334,6 +1334,7 @@ Status ExecutePerformActions(Session* session,
       bool has_touch_start = false;
       int buttons = 0;
       std::string button_type;
+      OriginType origin_type = kPointer;
       std::string element_id;
       for (size_t j = 0; j < actions->GetSize(); j++) {
         const base::DictionaryValue* pointer_action;
@@ -1344,10 +1345,18 @@ Status ExecutePerformActions(Session* session,
           pointer_action->GetDouble("x", &x);
           pointer_action->GetDouble("y", &y);
           const base::DictionaryValue* origin_dict;
+          origin_type = kViewPort;
           element_id = "";
-          if (pointer_action->HasKey("origin") &&
-              pointer_action->GetDictionary("origin", &origin_dict)) {
-            origin_dict->GetString(GetElementKey(), &element_id);
+          if (pointer_action->HasKey("origin")) {
+            if (pointer_action->GetDictionary("origin", &origin_dict)) {
+              origin_type = kElement;
+              origin_dict->GetString(GetElementKey(), &element_id);
+            } else {
+              std::string origin;
+              pointer_action->GetString("origin", &origin);
+              if (origin == "pointer")
+                origin_type = kPointer;
+            }
           }
         }
 
@@ -1360,6 +1369,7 @@ Status ExecutePerformActions(Session* session,
           MouseEvent event(StringToMouseEventType(action_type),
                            StringToMouseButton(button_type), x, y, 0, buttons,
                            click_count);
+          event.origin = origin_type;
           event.element_id = element_id;
           event.pointer_type = StringToPointerType(pointer_type);
           mouse_events.push_back(event);
@@ -1373,11 +1383,12 @@ Status ExecutePerformActions(Session* session,
           else if (action_type == "pointerUp")
             has_touch_start = false;
 
-          if (action_type != "pointerMove" || has_touch_start) {
-            TouchEvent event(StringToTouchEventType(action_type), x, y);
-            event.element_id = element_id;
-            touch_events.push_back(event);
-          }
+          TouchEvent event(StringToTouchEventType(action_type), x, y);
+          event.origin = origin_type;
+          event.element_id = element_id;
+          if (action_type == "pointerMove")
+            event.dispatch = has_touch_start;
+          touch_events.push_back(event);
         }
       }
 
@@ -1399,7 +1410,8 @@ Status ExecutePerformActions(Session* session,
   size_t max_list_length =
       std::max({longest_mouse_list_size, longest_touch_list_size,
                 longest_key_list_size, tick_durations.size()});
-  std::map<std::string, gfx::Point> element_center_point;
+  std::vector<gfx::Point> mouse_locations(mouse_events_list.size());
+  std::vector<gfx::Point> touch_locations(touch_events_list.size());
   int key_modifiers = 0;
   for (size_t i = 0; i < max_list_length; i++) {
     std::list<KeyEvent> dispatch_key_events;
@@ -1428,18 +1440,21 @@ Status ExecutePerformActions(Session* session,
       if (i < mouse_events_list[j].size() &&
           mouse_events_list[j][i].type != kPauseMouseEventType) {
         MouseEvent event = mouse_events_list[j][i];
-        if (!event.element_id.empty()) {
-          if (event.type == kMovedMouseEventType ||
-              element_center_point.find(event.element_id) ==
-                  element_center_point.end()) {
+        if (event.type == kMovedMouseEventType) {
+          if (event.origin == kPointer) {
+            event.x += mouse_locations[j].x();
+            event.y += mouse_locations[j].y();
+          } else if (!event.element_id.empty()) {
             int center_x = 0, center_y = 0;
             ElementInViewCenter(session, web_view, event.element_id, &center_x,
                                 &center_y);
-            element_center_point[event.element_id] =
-                gfx::Point(center_x, center_y);
+            event.x += center_x;
+            event.y += center_y;
           }
-          event.x += element_center_point[event.element_id].x();
-          event.y += element_center_point[event.element_id].y();
+          mouse_locations[j] = gfx::Point(event.x, event.y);
+        } else {
+          event.x = mouse_locations[j].x();
+          event.y = mouse_locations[j].y();
         }
         event.modifiers = key_modifiers;
         dispatch_mouse_events.push_back(event);
@@ -1457,20 +1472,24 @@ Status ExecutePerformActions(Session* session,
       if (i < touch_events_list[j].size() &&
           touch_events_list[j][i].type != kPause) {
         TouchEvent event = touch_events_list[j][i];
-        if (!event.element_id.empty()) {
-          if (event.type == kTouchMove ||
-              element_center_point.find(event.element_id) ==
-                  element_center_point.end()) {
+        if (event.type == kTouchMove) {
+          if (event.origin == kPointer) {
+            event.x += touch_locations[j].x();
+            event.y += touch_locations[j].y();
+          } else if (!event.element_id.empty()) {
             int center_x = 0, center_y = 0;
             ElementInViewCenter(session, web_view, event.element_id, &center_x,
                                 &center_y);
-            element_center_point[event.element_id] =
-                gfx::Point(center_x, center_y);
+            event.x += center_x;
+            event.y += center_y;
           }
-          event.x += element_center_point[event.element_id].x();
-          event.y += element_center_point[event.element_id].y();
+          touch_locations[j] = gfx::Point(event.x, event.y);
+        } else {
+          event.x = touch_locations[j].x();
+          event.y = touch_locations[j].y();
         }
-        dispatch_touch_events.push_back(event);
+        if (event.dispatch)
+          dispatch_touch_events.push_back(event);
       }
     }
     if (dispatch_touch_events.size() > 0) {