Add WebPointerProperties type.

Source/web/tests/WebInputEventConversionTest.cpp

 /*
  * Copyright (C) 2012 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 90 matching lines @@
     int pageWidth = 640;
     int pageHeight = 480;
     webViewImpl->resize(WebSize(pageWidth, pageHeight));
     webViewImpl->layout();
 
     RefPtrWillBeRawPtr<Document> document = toLocalFrame(webViewImpl->page()->mainFrame())->document();
     LocalDOMWindow* domWindow = document->domWindow();
     LayoutView* documentLayoutView = document->layoutView();
 
     WebTouchPoint p0, p1;
-    p0.id = 1;
-    p1.id = 2;
+    p0.pointerId = 1;
+    p1.pointerId = 2;
     p0.screenPosition = WebFloatPoint(100.f, 50.f);
     p1.screenPosition = WebFloatPoint(150.f, 25.f);
     p0.position = WebFloatPoint(10.f, 10.f);
     p1.position = WebFloatPoint(5.f, 5.f);
-    p0.radiusX = p1.radiusY = 10.f;
-    p0.radiusY = p1.radiusX = 5.f;
+    p0.width = p1.height = 10.f;
+    p0.width = p1.height = 5.f;
     p0.rotationAngle = p1.rotationAngle = 1.f;
-    p0.force = p1.force = 25.f;
+    p0.pressure = p1.pressure = 25.f;
 
-    RefPtrWillBeRawPtr<Touch> touch0 = Touch::create(toLocalFrame(webViewImpl->page()->mainFrame()), document.get(), p0.id, p0.screenPosition, p0.position, FloatSize(p0.radiusX, p0.radiusY), p0.rotationAngle, p0.force);
-    RefPtrWillBeRawPtr<Touch> touch1 = Touch::create(toLocalFrame(webViewImpl->page()->mainFrame()), document.get(), p1.id, p1.screenPosition, p1.position, FloatSize(p1.radiusX, p1.radiusY), p1.rotationAngle, p1.force);
+    RefPtrWillBeRawPtr<Touch> touch0 = Touch::create(toLocalFrame(webViewImpl->page()->mainFrame()), document.get(), p0.pointerId, p0.screenPosition, p0.position, FloatSize(p0.width, p0.height), p0.rotationAngle, p0.pressure);
+    RefPtrWillBeRawPtr<Touch> touch1 = Touch::create(toLocalFrame(webViewImpl->page()->mainFrame()), document.get(), p1.pointerId, p1.screenPosition, p1.position, FloatSize(p1.width, p1.height), p1.rotationAngle, p1.pressure);
 
     // Test touchstart.
     {
         RefPtrWillBeRawPtr<TouchList> touchList = TouchList::create();
         touchList->append(touch0);
         RefPtrWillBeRawPtr<TouchEvent> touchEvent = TouchEvent::create(touchList.get(), touchList.get(), touchList.get(), EventTypeNames::touchstart, domWindow, false, false, false, false, false, false);
 
         WebTouchEventBuilder webTouchBuilder(documentLayoutView, *touchEvent);
         ASSERT_EQ(1u, webTouchBuilder.touchesLength);
         EXPECT_EQ(WebInputEvent::TouchStart, webTouchBuilder.type);
         EXPECT_EQ(WebTouchPoint::StatePressed, webTouchBuilder.touches[0].state);
         EXPECT_FLOAT_EQ(p0.screenPosition.x, webTouchBuilder.touches[0].screenPosition.x);
         EXPECT_FLOAT_EQ(p0.screenPosition.y, webTouchBuilder.touches[0].screenPosition.y);
         EXPECT_FLOAT_EQ(p0.position.x, webTouchBuilder.touches[0].position.x);
         EXPECT_FLOAT_EQ(p0.position.y, webTouchBuilder.touches[0].position.y);
-        EXPECT_FLOAT_EQ(p0.radiusX, webTouchBuilder.touches[0].radiusX);
-        EXPECT_FLOAT_EQ(p0.radiusY, webTouchBuilder.touches[0].radiusY);
+        EXPECT_FLOAT_EQ(p0.width, webTouchBuilder.touches[0].width);
+        EXPECT_FLOAT_EQ(p0.height, webTouchBuilder.touches[0].height);
         EXPECT_FLOAT_EQ(p0.rotationAngle, webTouchBuilder.touches[0].rotationAngle);
-        EXPECT_FLOAT_EQ(p0.force, webTouchBuilder.touches[0].force);
+        EXPECT_FLOAT_EQ(p0.pressure, webTouchBuilder.touches[0].pressure);
     }
 
     // Test touchmove.
     {
         RefPtrWillBeRawPtr<TouchList> activeTouchList = TouchList::create();
         RefPtrWillBeRawPtr<TouchList> movedTouchList = TouchList::create();
         activeTouchList->append(touch0);
         activeTouchList->append(touch1);
         movedTouchList->append(touch0);
         RefPtrWillBeRawPtr<TouchEvent> touchEvent = TouchEvent::create(activeTouchList.get(), activeTouchList.get(), movedTouchList.get(), EventTypeNames::touchmove, domWindow, false, false, false, false, false, false);
 
         WebTouchEventBuilder webTouchBuilder(documentLayoutView, *touchEvent);
         ASSERT_EQ(2u, webTouchBuilder.touchesLength);
         EXPECT_EQ(WebInputEvent::TouchMove, webTouchBuilder.type);
         EXPECT_EQ(WebTouchPoint::StateMoved, webTouchBuilder.touches[0].state);
         EXPECT_EQ(WebTouchPoint::StateStationary, webTouchBuilder.touches[1].state);
-        EXPECT_EQ(p0.id, webTouchBuilder.touches[0].id);
-        EXPECT_EQ(p1.id, webTouchBuilder.touches[1].id);
+        EXPECT_EQ(p0.pointerId, webTouchBuilder.touches[0].pointerId);
+        EXPECT_EQ(p1.pointerId, webTouchBuilder.touches[1].pointerId);
     }
 
     // Test touchmove, different point yields same ordering.
     {
         RefPtrWillBeRawPtr<TouchList> activeTouchList = TouchList::create();
         RefPtrWillBeRawPtr<TouchList> movedTouchList = TouchList::create();
         activeTouchList->append(touch0);
         activeTouchList->append(touch1);
         movedTouchList->append(touch1);
         RefPtrWillBeRawPtr<TouchEvent> touchEvent = TouchEvent::create(activeTouchList.get(), activeTouchList.get(), movedTouchList.get(), EventTypeNames::touchmove, domWindow, false, false, false, false, false, false);
 
         WebTouchEventBuilder webTouchBuilder(documentLayoutView, *touchEvent);
         ASSERT_EQ(2u, webTouchBuilder.touchesLength);
         EXPECT_EQ(WebInputEvent::TouchMove, webTouchBuilder.type);
         EXPECT_EQ(WebTouchPoint::StateStationary, webTouchBuilder.touches[0].state);
         EXPECT_EQ(WebTouchPoint::StateMoved, webTouchBuilder.touches[1].state);
-        EXPECT_EQ(p0.id, webTouchBuilder.touches[0].id);
-        EXPECT_EQ(p1.id, webTouchBuilder.touches[1].id);
+        EXPECT_EQ(p0.pointerId, webTouchBuilder.touches[0].pointerId);
+        EXPECT_EQ(p1.pointerId, webTouchBuilder.touches[1].pointerId);
     }
 
     // Test touchend.
     {
         RefPtrWillBeRawPtr<TouchList> activeTouchList = TouchList::create();
         RefPtrWillBeRawPtr<TouchList> releasedTouchList = TouchList::create();
         activeTouchList->append(touch0);
         releasedTouchList->append(touch1);
         RefPtrWillBeRawPtr<TouchEvent> touchEvent = TouchEvent::create(activeTouchList.get(), activeTouchList.get(), releasedTouchList.get(), EventTypeNames::touchend, domWindow, false, false, false, false, false, false);
 
         WebTouchEventBuilder webTouchBuilder(documentLayoutView, *touchEvent);
         ASSERT_EQ(2u, webTouchBuilder.touchesLength);
         EXPECT_EQ(WebInputEvent::TouchEnd, webTouchBuilder.type);
         EXPECT_EQ(WebTouchPoint::StateStationary, webTouchBuilder.touches[0].state);
         EXPECT_EQ(WebTouchPoint::StateReleased, webTouchBuilder.touches[1].state);
-        EXPECT_EQ(p0.id, webTouchBuilder.touches[0].id);
-        EXPECT_EQ(p1.id, webTouchBuilder.touches[1].id);
+        EXPECT_EQ(p0.pointerId, webTouchBuilder.touches[0].pointerId);
+        EXPECT_EQ(p1.pointerId, webTouchBuilder.touches[1].pointerId);
     }
 
     // Test touchcancel.
     {
         RefPtrWillBeRawPtr<TouchList> activeTouchList = TouchList::create();
         RefPtrWillBeRawPtr<TouchList> cancelledTouchList = TouchList::create();
         cancelledTouchList->append(touch0);
         cancelledTouchList->append(touch1);
         RefPtrWillBeRawPtr<TouchEvent> touchEvent = TouchEvent::create(activeTouchList.get(), activeTouchList.get(), cancelledTouchList.get(), EventTypeNames::touchcancel, domWindow, false, false, false, false, false, false);
 
         WebTouchEventBuilder webTouchBuilder(documentLayoutView, *touchEvent);
         ASSERT_EQ(2u, webTouchBuilder.touchesLength);
         EXPECT_EQ(WebInputEvent::TouchCancel, webTouchBuilder.type);
         EXPECT_EQ(WebTouchPoint::StateCancelled, webTouchBuilder.touches[0].state);
         EXPECT_EQ(WebTouchPoint::StateCancelled, webTouchBuilder.touches[1].state);
-        EXPECT_EQ(p0.id, webTouchBuilder.touches[0].id);
-        EXPECT_EQ(p1.id, webTouchBuilder.touches[1].id);
+        EXPECT_EQ(p0.pointerId, webTouchBuilder.touches[0].pointerId);
+        EXPECT_EQ(p1.pointerId, webTouchBuilder.touches[1].pointerId);
     }
 
     // Test max point limit.
     {
         RefPtrWillBeRawPtr<TouchList> touchList = TouchList::create();
         RefPtrWillBeRawPtr<TouchList> changedTouchList = TouchList::create();
         for (int i = 0; i <= static_cast<int>(WebTouchEvent::touchesLengthCap) * 2; ++i) {
-            RefPtrWillBeRawPtr<Touch> touch = Touch::create(toLocalFrame(webViewImpl->page()->mainFrame()), document.get(), i, p0.screenPosition, p0.position, FloatSize(p0.radiusX, p0.radiusY), p0.rotationAngle, p0.force);
+            RefPtrWillBeRawPtr<Touch> touch = Touch::create(toLocalFrame(webViewImpl->page()->mainFrame()), document.get(), i, p0.screenPosition, p0.position, FloatSize(p0.width, p0.height), p0.rotationAngle, p0.pressure);
             touchList->append(touch);
             changedTouchList->append(touch);
         }
         RefPtrWillBeRawPtr<TouchEvent> touchEvent = TouchEvent::create(touchList.get(), touchList.get(), touchList.get(), EventTypeNames::touchstart, domWindow, false, false, false, false, false, false);
 
         WebTouchEventBuilder webTouchBuilder(documentLayoutView, *touchEvent);
         ASSERT_EQ(static_cast<unsigned>(WebTouchEvent::touchesLengthCap), webTouchBuilder.touchesLength);
     }
 }
 
@@ skipping 152 matching lines @@
 
     {
         WebTouchEvent webTouchEvent;
         webTouchEvent.type = WebInputEvent::TouchMove;
         webTouchEvent.touchesLength = 1;
         webTouchEvent.touches[0].state = WebTouchPoint::StateMoved;
         webTouchEvent.touches[0].screenPosition.x = 10.6f;
         webTouchEvent.touches[0].screenPosition.y = 10.4f;
         webTouchEvent.touches[0].position.x = 10.6f;
         webTouchEvent.touches[0].position.y = 10.4f;
-        webTouchEvent.touches[0].radiusX = 10.6f;
-        webTouchEvent.touches[0].radiusY = 10.4f;
+        webTouchEvent.touches[0].width = 10.6f;
+        webTouchEvent.touches[0].height = 10.4f;
 
         EXPECT_FLOAT_EQ(10.6f, webTouchEvent.touches[0].screenPosition.x);
         EXPECT_FLOAT_EQ(10.4f, webTouchEvent.touches[0].screenPosition.y);
         EXPECT_FLOAT_EQ(10.6f, webTouchEvent.touches[0].position.x);
         EXPECT_FLOAT_EQ(10.4f, webTouchEvent.touches[0].position.y);
-        EXPECT_FLOAT_EQ(10.6f, webTouchEvent.touches[0].radiusX);
-        EXPECT_FLOAT_EQ(10.4f, webTouchEvent.touches[0].radiusY);
+        EXPECT_FLOAT_EQ(10.6f, webTouchEvent.touches[0].width);
+        EXPECT_FLOAT_EQ(10.4f, webTouchEvent.touches[0].height);
 
         PlatformTouchEventBuilder platformTouchBuilder(view, webTouchEvent);
         EXPECT_FLOAT_EQ(10.6f, platformTouchBuilder.touchPoints()[0].screenPos().x());
         EXPECT_FLOAT_EQ(10.4f, platformTouchBuilder.touchPoints()[0].screenPos().y());
         EXPECT_FLOAT_EQ(5.3f, platformTouchBuilder.touchPoints()[0].pos().x());
         EXPECT_FLOAT_EQ(5.2f, platformTouchBuilder.touchPoints()[0].pos().y());
         EXPECT_FLOAT_EQ(5.3f, platformTouchBuilder.touchPoints()[0].radius().width());
         EXPECT_FLOAT_EQ(5.2f, platformTouchBuilder.touchPoints()[0].radius().height());
     }
 
@@ skipping 48 matching lines @@
         RefPtrWillBeRawPtr<TouchList> touchList = TouchList::create();
         touchList->append(touch);
         RefPtrWillBeRawPtr<TouchEvent> touchEvent = TouchEvent::create(touchList.get(), touchList.get(), touchList.get(), EventTypeNames::touchmove, domWindow, false, false, false, false, false, false);
 
         WebTouchEventBuilder webTouchBuilder(documentLayoutView, *touchEvent);
         ASSERT_EQ(1u, webTouchBuilder.touchesLength);
         EXPECT_EQ(10, webTouchBuilder.touches[0].screenPosition.x);
         EXPECT_FLOAT_EQ(9.5, webTouchBuilder.touches[0].screenPosition.y);
         EXPECT_FLOAT_EQ(3.5, webTouchBuilder.touches[0].position.x);
         EXPECT_FLOAT_EQ(2, webTouchBuilder.touches[0].position.y);
-        EXPECT_FLOAT_EQ(4, webTouchBuilder.touches[0].radiusX);
-        EXPECT_FLOAT_EQ(4.5, webTouchBuilder.touches[0].radiusY);
+        EXPECT_FLOAT_EQ(4, webTouchBuilder.touches[0].width);
+        EXPECT_FLOAT_EQ(4.5, webTouchBuilder.touches[0].height);
         EXPECT_FALSE(webTouchBuilder.cancelable);
     }
 }
 
 TEST(WebInputEventConversionTest, InputEventsTransform)
 {
     const std::string baseURL("http://www.test2.com/");
     const std::string fileName("fixed_layout.html");
 
     URLTestHelpers::registerMockedURLFromBaseURL(WebString::fromUTF8(baseURL.c_str()), WebString::fromUTF8("fixed_layout.html"));
@@ skipping 118 matching lines @@
 
     {
         WebTouchEvent webTouchEvent;
         webTouchEvent.type = WebInputEvent::TouchMove;
         webTouchEvent.touchesLength = 1;
         webTouchEvent.touches[0].state = WebTouchPoint::StateMoved;
         webTouchEvent.touches[0].screenPosition.x = 100;
         webTouchEvent.touches[0].screenPosition.y = 110;
         webTouchEvent.touches[0].position.x = 100;
         webTouchEvent.touches[0].position.y = 110;
-        webTouchEvent.touches[0].radiusX = 30;
-        webTouchEvent.touches[0].radiusY = 30;
+        webTouchEvent.touches[0].width = 30;
+        webTouchEvent.touches[0].height = 30;
 
         PlatformTouchEventBuilder platformTouchBuilder(view, webTouchEvent);
         EXPECT_FLOAT_EQ(100, platformTouchBuilder.touchPoints()[0].screenPos().x());
         EXPECT_FLOAT_EQ(110, platformTouchBuilder.touchPoints()[0].screenPos().y());
         EXPECT_FLOAT_EQ(30, platformTouchBuilder.touchPoints()[0].pos().x());
         EXPECT_FLOAT_EQ(30, platformTouchBuilder.touchPoints()[0].pos().y());
         EXPECT_FLOAT_EQ(10, platformTouchBuilder.touchPoints()[0].radius().width());
         EXPECT_FLOAT_EQ(10, platformTouchBuilder.touchPoints()[0].radius().height());
     }
 }
@@ skipping 309 matching lines @@
         EXPECT_EQ(15, platformWheelBuilder.deltaX());
         EXPECT_EQ(10, platformWheelBuilder.deltaY());
         EXPECT_EQ(PlatformEvent::AltKey, platformWheelBuilder.modifiers());
         EXPECT_TRUE(platformWheelBuilder.hasPreciseScrollingDeltas());
         EXPECT_FALSE(platformWheelBuilder.canScroll());
         EXPECT_EQ(platformWheelBuilder.railsMode(), PlatformEvent::RailsModeVertical);
     }
 }
 
 } // namespace blink