| 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 9e689665dc4a6218bd2780e99ef5bcfbc716d355..b5a1cb400cca249b09a9b0a9d6b5931cbfe47972 100644
|
| --- a/content/browser/renderer_host/input/touch_event_queue.cc
|
| +++ b/content/browser/renderer_host/input/touch_event_queue.cc
|
| @@ -49,13 +49,13 @@ bool ShouldTouchTriggerTimeout(const WebTouchEvent& event) {
|
| // Compare all properties of touch points to determine the state.
|
| bool HasPointChanged(const WebTouchPoint& point_1,
|
| const WebTouchPoint& point_2) {
|
| - DCHECK_EQ(point_1.id, point_2.id);
|
| + DCHECK_EQ(point_1.pointerId, point_2.pointerId);
|
| if (point_1.screenPosition != point_2.screenPosition ||
|
| point_1.position != point_2.position ||
|
| - point_1.radiusX != point_2.radiusX ||
|
| - point_1.radiusY != point_2.radiusY ||
|
| + point_1.width != point_2.width ||
|
| + point_1.height != point_2.height ||
|
| point_1.rotationAngle != point_2.rotationAngle ||
|
| - point_1.force != point_2.force) {
|
| + point_1.pressure != point_2.pressure) {
|
| return true;
|
| }
|
| return false;
|
| @@ -701,7 +701,7 @@ void TouchEventQueue::SendTouchEventImmediately(
|
| // Touches with same id may not have same index in Touches array.
|
| for (unsigned int j = 0; j < touch->event.touchesLength; ++j) {
|
| const WebTouchPoint& current_touchmove_point = touch->event.touches[j];
|
| - if (current_touchmove_point.id != last_touch_point.id)
|
| + if (current_touchmove_point.pointerId != last_touch_point.pointerId)
|
| continue;
|
|
|
| if (!HasPointChanged(last_touch_point, current_touchmove_point))
|
| @@ -790,7 +790,7 @@ TouchEventQueue::FilterBeforeForwarding(const WebTouchEvent& event) {
|
| continue;
|
|
|
| for (size_t j = 0; j < last_sent_touchevent_->touchesLength; ++j) {
|
| - if (point.id != last_sent_touchevent_->touches[j].id)
|
| + if (point.pointerId != last_sent_touchevent_->touches[j].pointerId)
|
| continue;
|
|
|
| if (event.type != WebInputEvent::TouchMove)
|
|
|