Fix movementX/Y attributes for touch pointer events

content/browser/renderer_host/input/input_router_impl.cc

 // Copyright 2013 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 "content/browser/renderer_host/input/input_router_impl.h"
 
 #include <math.h>
 
 #include <utility>
 
@@ skipping 166 matching lines @@
       // GestureScrollBegin).
       touch_event_queue_->PrependTouchScrollNotification();
       touch_scroll_started_sent_ = true;
     }
     touch_event_queue_->OnGestureScrollEvent(gesture_event);
   }
 
   gesture_event_queue_.QueueEvent(gesture_event);
 }
 
-void InputRouterImpl::SendTouchEvent(
-    const TouchEventWithLatencyInfo& touch_event) {
+void InputRouterImpl::SendTouchEvent(TouchEventWithLatencyInfo touch_event) {

[Navid Zolghadr, 2017/02/08 17:18:49]

InputRouterImpl particularly was a better place for it as it also enabled the
logic for the touch emulation which the previous logic didn't. There is only
this problem of the event being const ref. I'm not sure just copying it like
this was a very ideal solution. What do you suggest?

[sadrul, 2017/02/09 03:11:34]

(I left a comment in input_router.h)

I think the interface should still take a const-ref. The implementation here
should make a copy.

LegacyTouchEventQueue::CoalescedWebTouchEvent makes a copy anyway. So I don't
think that's going to be a problem.

+  SetMovementXYForTouchPoints(&touch_event.event);
   input_stream_validator_.Validate(touch_event.event);
   touch_event_queue_->QueueEvent(touch_event);
 }
 
 // Forwards MouseEvent without passing it through
 // TouchpadTapSuppressionController.
 void InputRouterImpl::SendMouseEventImmediately(
     const MouseEventWithLatencyInfo& mouse_event) {
   if (mouse_event.event.type() == blink::WebInputEvent::MouseMove)
     mouse_move_queue_.push_back(mouse_event);
@@ skipping 432 matching lines @@
     return;
 
   flush_requested_ = false;
   client_->DidFlush();
 }
 
 void InputRouterImpl::SetFrameTreeNodeId(int frameTreeNodeId) {
   frame_tree_node_id_ = frameTreeNodeId;
 }
 
+void InputRouterImpl::SetMovementXYForTouchPoints(blink::WebTouchEvent* event) {
+  for (size_t i = 0; i < event->touchesLength; ++i) {
+    blink::WebTouchPoint* touchPoint = &event->touches[i];

[sadrul, 2017/02/09 03:11:34]

touch_point (that's the style used in non-blink chromium code)

[Navid Zolghadr, 2017/02/09 16:35:08]

Done.

+    if (touchPoint->state == blink::WebTouchPoint::StateMoved) {
+      const gfx::Point& lastPosition = global_touch_position_[touchPoint->id];

[sadrul, 2017/02/09 03:11:34]

last_position

[Navid Zolghadr, 2017/02/09 16:35:08]

Done.

+      touchPoint->movementX = touchPoint->screenPosition.x - lastPosition.x();
+      touchPoint->movementY = touchPoint->screenPosition.y - lastPosition.y();
+      global_touch_position_[touchPoint->id].SetPoint(
+          touchPoint->screenPosition.x, touchPoint->screenPosition.y);
+    } else {
+      touchPoint->movementX = 0;
+      touchPoint->movementY = 0;
+      if (event->touches[i].state == blink::WebTouchPoint::StateReleased ||
+          event->touches[i].state == blink::WebTouchPoint::StateCancelled) {
+        global_touch_position_.erase(event->touches[i].id);
+      } else if (event->touches[i].state ==
+                 blink::WebTouchPoint::StatePressed) {
+        global_touch_position_[touchPoint->id] = gfx::Point(

[sadrul, 2017/02/09 03:11:34]

Do you want to DCHECK that |touch_point->id| is not already in
|global_touch_position_|?

[Navid Zolghadr, 2017/02/09 16:35:08]

Done.

+            touchPoint->screenPosition.x, touchPoint->screenPosition.y);
+      }
+    }
+  }
+}
+
 }  // namespace content