Use new WebTouchPoint field names.

content/renderer/pepper/event_conversion.cc

 // Copyright (c) 2012 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/renderer/pepper/event_conversion.h"
 
 #include "base/basictypes.h"
 #include "base/i18n/char_iterator.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 224 matching lines @@
         (touch_point.state == WebTouchPoint::StateReleased ||
          touch_point.state == WebTouchPoint::StateCancelled)) {
       continue;
     }
     if (included_types == CHANGED &&
         (touch_point.state == WebTouchPoint::StateUndefined ||
          touch_point.state == WebTouchPoint::StateStationary)) {
       continue;
     }
     PP_TouchPoint pp_pt;
-    pp_pt.id = touch_point.id;
+    pp_pt.id = touch_point.pointerId;
     pp_pt.position.x = touch_point.position.x;
     pp_pt.position.y = touch_point.position.y;
-    pp_pt.radius.x = touch_point.radiusX;
-    pp_pt.radius.y = touch_point.radiusY;
+    pp_pt.radius.x = touch_point.width;
+    pp_pt.radius.y = touch_point.height;
     pp_pt.rotation_angle = touch_point.rotationAngle;
-    pp_pt.pressure = touch_point.force;
+    pp_pt.pressure = touch_point.pressure;
     result->push_back(pp_pt);
   }
 }
 
 void AppendTouchEvent(const WebInputEvent& event,
                       std::vector<InputEventData>* result_events) {
   const WebTouchEvent& touch_event =
       reinterpret_cast<const WebTouchEvent&>(event);
 
   InputEventData result = GetEventWithCommonFieldsAndType(event);
   SetPPTouchPoints(
       touch_event.touches, touch_event.touchesLength, ACTIVE, &result.touches);
   SetPPTouchPoints(touch_event.touches,
                    touch_event.touchesLength,
                    CHANGED,
                    &result.changed_touches);
   SetPPTouchPoints(touch_event.touches,
                    touch_event.touchesLength,
                    ALL,
                    &result.target_touches);
 
   result_events->push_back(result);
 }
 
 WebTouchPoint CreateWebTouchPoint(const PP_TouchPoint& pp_pt,
                                   WebTouchPoint::State state) {
   WebTouchPoint pt;
-  pt.id = pp_pt.id;
+  pt.pointerId = pp_pt.id;
   pt.position.x = pp_pt.position.x;
   pt.position.y = pp_pt.position.y;
   // TODO bug:http://code.google.com/p/chromium/issues/detail?id=93902
   pt.screenPosition.x = 0;
   pt.screenPosition.y = 0;
-  pt.force = pp_pt.pressure;
-  pt.radiusX = pp_pt.radius.x;
-  pt.radiusY = pp_pt.radius.y;
+  pt.pressure = pp_pt.pressure;
+  pt.width = pp_pt.radius.x;
+  pt.height = pp_pt.radius.y;
   pt.rotationAngle = pp_pt.rotation_angle;
   pt.state = state;
   return pt;
 }
 
 bool HasTouchPointWithId(const WebTouchPoint* web_touches,
                          uint32_t web_touches_length,
                          uint32_t id) {
   // Note: A brute force search to find the (potentially) existing touch point
   // is cheap given the small bound on |WebTouchEvent::touchesLengthCap|.
   for (uint32_t i = 0; i < web_touches_length; ++i) {
-    if (web_touches[i].id == static_cast<int>(id))
+    if (web_touches[i].pointerId == static_cast<int>(id))
       return true;
   }
   return false;
 }
 
 void SetWebTouchPointsIfNotYetSet(const std::vector<PP_TouchPoint>& pp_touches,
                                   WebTouchPoint::State state,
                                   WebTouchPoint* web_touches,
                                   uint32_t* web_touches_length) {
   const uint32_t initial_web_touches_length = *web_touches_length;
@@ skipping 439 matching lines @@
     case WebInputEvent::TouchStart:
       return PP_INPUTEVENT_CLASS_TOUCH;
     case WebInputEvent::Undefined:
     default:
       CHECK(WebInputEvent::isGestureEventType(type));
       return PP_InputEvent_Class(0);
   }
 }
 
 }  // namespace content