Use new WebTouchPoint field names.

content/common/input/web_input_event_traits.cc

Index: content/common/input/web_input_event_traits.cc
diff --git a/content/common/input/web_input_event_traits.cc b/content/common/input/web_input_event_traits.cc
index 547290783f71d999e8f9d66c58443b1ceb37dfae..e9d84a8a65765847462731d4f23498905d322f3d 100644
--- a/content/common/input/web_input_event_traits.cc
+++ b/content/common/input/web_input_event_traits.cc
@@ -94,16 +94,16 @@ void ApppendTouchPointDetails(const WebTouchPoint& point, std::string* result) {
   StringAppendF(result,
                  "  (ID: %d, State: %d, ScreenPos: (%f, %f), Pos: (%f, %f),"
                      " Radius: (%f, %f), Rot: %f, Force: %f),\n",
-  point.id,
+  point.pointerId,
   point.state,
   point.screenPosition.x,
   point.screenPosition.y,
   point.position.x,
   point.position.y,
-  point.radiusX,
-  point.radiusY,
+  point.width,
+  point.height,
   point.rotationAngle,
-  point.force);
+  point.pressure);
 }
 
 void ApppendEventDetails(const WebTouchEvent& event, std::string* result) {
@@ -192,7 +192,7 @@ void Coalesce(const WebMouseWheelEvent& event_to_coalesce,
 // Returns |kInvalidTouchIndex| iff |event| lacks a touch with an ID of |id|.
 int GetIndexOfTouchID(const WebTouchEvent& event, int id) {
   for (unsigned i = 0; i < event.touchesLength; ++i) {
-    if (event.touches[i].id == id)
+    if (event.touches[i].pointerId == id)
       return i;
   }
   return kInvalidTouchIndex;
@@ -214,7 +214,7 @@ bool CanCoalesce(const WebTouchEvent& event_to_coalesce,
       (1 << event.touchesLength) - 1);
   for (unsigned i = 0; i < event_to_coalesce.touchesLength; ++i) {
     int event_touch_index =
-        GetIndexOfTouchID(event, event_to_coalesce.touches[i].id);
+        GetIndexOfTouchID(event, event_to_coalesce.touches[i].pointerId);
     if (event_touch_index == kInvalidTouchIndex)
       return false;
     if (!unmatched_event_touches[event_touch_index])
@@ -235,7 +235,7 @@ void Coalesce(const WebTouchEvent& event_to_coalesce, WebTouchEvent* event) {
   WebTouchEvent old_event = *event;
   *event = event_to_coalesce;
   for (unsigned i = 0; i < event->touchesLength; ++i) {
-    int i_old = GetIndexOfTouchID(old_event, event->touches[i].id);
+    int i_old = GetIndexOfTouchID(old_event, event->touches[i].pointerId);
     if (old_event.touches[i_old].state == blink::WebTouchPoint::StateMoved)
       event->touches[i].state = blink::WebTouchPoint::StateMoved;
   }