Add WebPointerProperties type.

Source/web/WebInputEventConversion.cpp

 /*
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 399 matching lines @@
         return WebTouchPoint::StateCancelled;
     if (type == EventTypeNames::touchstart)
         return WebTouchPoint::StatePressed;
     if (type == EventTypeNames::touchmove)
         return WebTouchPoint::StateMoved;
     return WebTouchPoint::StateUndefined;
 }
 
 PlatformTouchPointBuilder::PlatformTouchPointBuilder(Widget* widget, const WebTouchPoint& point)
 {
-    m_id = point.id;
+    m_id = point.pointerId;
     m_state = toPlatformTouchPointState(point.state);
 
     // This assumes convertFromContainingWindow does only translations, not scales.
     FloatPoint floatPos = convertHitPointToWindow(widget, point.position);
     IntPoint flooredPoint = flooredIntPoint(floatPos);
     m_pos = widget->convertFromContainingWindow(flooredPoint) + (floatPos - flooredPoint);
 
     m_screenPos = FloatPoint(point.screenPosition.x, point.screenPosition.y);
-    m_radius = scaleSizeToWindow(widget, FloatSize(point.radiusX, point.radiusY));
+    m_radius = scaleSizeToWindow(widget, FloatSize(point.width, point.height));
     m_rotationAngle = point.rotationAngle;
-    m_force = point.force;
+    m_force = point.pressure;
 }
 
 PlatformTouchEventBuilder::PlatformTouchEventBuilder(Widget* widget, const WebTouchEvent& event)
 {
     m_type = toPlatformTouchEventType(event.type);
     m_modifiers = toPlatformEventModifiers(event.modifiers);
     m_timestamp = event.timeStampSeconds;
     m_causesScrollingIfUncanceled = event.causesScrollingIfUncanceled;
 
     for (unsigned i = 0; i < event.touchesLength; ++i)
@@ skipping 208 matching lines @@
     case PlatformEvent::Char:
         return WebInputEvent::Char;
     default:
         return WebInputEvent::Undefined;
     }
 }
 
 static WebTouchPoint toWebTouchPoint(const Touch* touch, const LayoutObject* layoutObject, WebTouchPoint::State state)
 {
     WebTouchPoint point;
-    point.id = touch->identifier();
+    point.pointerId = touch->identifier();
     point.screenPosition = touch->screenLocation();
     point.position = convertAbsoluteLocationForLayoutObjectFloat(touch->absoluteLocation(), *layoutObject);
-    point.radiusX = touch->radiusX();
-    point.radiusY = touch->radiusY();
+    point.width = touch->radiusX();
+    point.height = touch->radiusY();
     point.rotationAngle = touch->rotationAngle();
-    point.force = touch->force();
+    point.pressure = touch->force();
     point.state = state;
     return point;
 }
 
 static unsigned indexOfTouchPointWithId(const WebTouchPoint* touchPoints, unsigned touchPointsLength, unsigned id)
 {
     for (unsigned i = 0; i < touchPointsLength; ++i) {
-        if (touchPoints[i].id == static_cast<int>(id))
+        if (touchPoints[i].pointerId == static_cast<int>(id))
             return i;
     }
     return std::numeric_limits<unsigned>::max();
 }
 
 static void addTouchPointsUpdateStateIfNecessary(WebTouchPoint::State state, TouchList* touches, WebTouchPoint* touchPoints, unsigned* touchPointsLength, const LayoutObject* layoutObject)
 {
     unsigned initialTouchPointsLength = *touchPointsLength;
     for (unsigned i = 0; i < touches->length(); ++i) {
         const unsigned pointIndex = *touchPointsLength;
@@ skipping 67 matching lines @@
     modifiers = getWebInputModifiers(event);
 
     globalX = event.screenX();
     globalY = event.screenY();
     IntPoint localPoint = convertAbsoluteLocationForLayoutObject(event.absoluteLocation(), *layoutObject);
     x = localPoint.x();
     y = localPoint.y();
 }
 
 } // namespace blink