Use new WebTouchPoint field names.

content/browser/renderer_host/input/touch_event_queue.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/touch_event_queue.h"
 
 #include "base/auto_reset.h"
 #include "base/stl_util.h"
 #include "base/trace_event/trace_event.h"
 #include "content/browser/renderer_host/input/timeout_monitor.h"
@@ skipping 31 matching lines @@
 bool ShouldTouchTriggerTimeout(const WebTouchEvent& event) {
   return (event.type == WebInputEvent::TouchStart ||
           event.type == WebInputEvent::TouchMove) &&
          WebInputEventTraits::WillReceiveAckFromRenderer(event) &&
          event.cancelable;
 }
 
 // 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;
 }
 
 }  // namespace
 
 
 // Cancels a touch sequence if a touchstart or touchmove ack response is
 // sufficiently delayed.
@@ skipping 625 matching lines @@
   // For touchmove events, compare touch points position from current event
   // to last sent event and update touch points state.
   if (touch->event.type == WebInputEvent::TouchMove) {
     CHECK(last_sent_touchevent_);
     for (unsigned int i = 0; i < last_sent_touchevent_->touchesLength; ++i) {
       const WebTouchPoint& last_touch_point =
           last_sent_touchevent_->touches[i];
       // 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))
           touch->event.touches[j].state = WebTouchPoint::StateStationary;
 
         break;
       }
     }
   }
 
@@ skipping 68 matching lines @@
       const WebTouchPoint& point = event.touches[i];
       if (point.state == WebTouchPoint::StateStationary)
         continue;
 
       // |last_sent_touchevent_| will be non-null as long as there is an
       // active touch sequence being forwarded to the renderer.
       if (!last_sent_touchevent_)
         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)
           return FORWARD_TO_RENDERER;
 
         // All pointers in TouchMove events may have state as StateMoved,
         // even though none of the pointers have not changed in real.
         // Forward these events when at least one pointer has changed.
         if (HasPointChanged(last_sent_touchevent_->touches[j], point))
           return FORWARD_TO_RENDERER;
@@ skipping 16 matching lines @@
     if (ack_result == INPUT_EVENT_ACK_STATE_CONSUMED)
       send_touch_events_async_ = false;
     has_handler_for_current_sequence_ |=
         ack_result != INPUT_EVENT_ACK_STATE_NO_CONSUMER_EXISTS;
   } else if (WebTouchEventTraits::IsTouchSequenceEnd(event)) {
     has_handler_for_current_sequence_ = false;
   }
 }
 
 }  // namespace content