Expose fractional TouchEvent coordinates

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 221 matching lines @@
         webTouchEvent.touches[0].radiusY = 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);
 
         PlatformTouchEventBuilder platformTouchBuilder(view, webTouchEvent);
-        EXPECT_EQ(10, platformTouchBuilder.touchPoints()[0].screenPos().x());
-        EXPECT_EQ(10, platformTouchBuilder.touchPoints()[0].screenPos().y());
-        EXPECT_EQ(5, platformTouchBuilder.touchPoints()[0].pos().x());
-        EXPECT_EQ(5, platformTouchBuilder.touchPoints()[0].pos().y());
-        EXPECT_EQ(5, platformTouchBuilder.touchPoints()[0].radiusX());
-        EXPECT_EQ(5, platformTouchBuilder.touchPoints()[0].radiusY());
+        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());
     }
 
     // Reverse builders should *not* go back to physical pixels, as they are used for plugins
     // which expect CSS pixel coordinates.
     {
         PlatformMouseEvent platformMouseEvent(IntPoint(10, 10), IntPoint(10, 10), LeftButton, PlatformEvent::MouseMoved, 1, false, false, false, false, 0);
         RefPtrWillBeRawPtr<MouseEvent> mouseEvent = MouseEvent::create(WebCore::EventTypeNames::mousemove, domWindow, platformMouseEvent, 0, document);
         WebMouseEventBuilder webMouseBuilder(view, documentRenderView, *mouseEvent);
 
         EXPECT_EQ(10, webMouseBuilder.x);
@@ skipping 18 matching lines @@
 
         EXPECT_EQ(10, webGestureBuilder.x);
         EXPECT_EQ(10, webGestureBuilder.y);
         EXPECT_EQ(10, webGestureBuilder.globalX);
         EXPECT_EQ(10, webGestureBuilder.globalY);
         EXPECT_EQ(10, webGestureBuilder.data.scrollUpdate.deltaX);
         EXPECT_EQ(10, webGestureBuilder.data.scrollUpdate.deltaY);
     }
 
     {
-        RefPtrWillBeRawPtr<Touch> touch = Touch::create(webViewImpl->page()->mainFrame(), document.get(), 0, 10, 10, 10, 10, 10, 10, 0, 0);
+        RefPtrWillBeRawPtr<Touch> touch = Touch::create(webViewImpl->page()->mainFrame(), document.get(), 0, FloatPoint(10, 9.5), FloatPoint(3.5, 2), FloatSize(4, 4.5), 0, 0);
         RefPtrWillBeRawPtr<TouchList> touchList = TouchList::create();
         touchList->append(touch);
         RefPtrWillBeRawPtr<TouchEvent> touchEvent = TouchEvent::create(touchList.get(), touchList.get(), touchList.get(), WebCore::EventTypeNames::touchmove, domWindow, false, false, false, false, false);
 
         WebTouchEventBuilder webTouchBuilder(view, documentRenderView, *touchEvent);
         ASSERT_EQ(1u, webTouchBuilder.touchesLength);
         EXPECT_EQ(10, webTouchBuilder.touches[0].screenPosition.x);
-        EXPECT_EQ(10, webTouchBuilder.touches[0].screenPosition.y);
-        EXPECT_EQ(10, webTouchBuilder.touches[0].position.x);
-        EXPECT_EQ(10, webTouchBuilder.touches[0].position.y);
-        EXPECT_EQ(10, webTouchBuilder.touches[0].radiusX);
-        EXPECT_EQ(10, webTouchBuilder.touches[0].radiusY);
+        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_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 122 matching lines @@
         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;
 
         PlatformTouchEventBuilder platformTouchBuilder(view, webTouchEvent);
-        EXPECT_EQ(100, platformTouchBuilder.touchPoints()[0].screenPos().x());
-        EXPECT_EQ(110, platformTouchBuilder.touchPoints()[0].screenPos().y());
-        EXPECT_EQ(30, platformTouchBuilder.touchPoints()[0].pos().x());
-        EXPECT_EQ(30, platformTouchBuilder.touchPoints()[0].pos().y());
-        EXPECT_EQ(10, platformTouchBuilder.touchPoints()[0].radiusX());
-        EXPECT_EQ(10, platformTouchBuilder.touchPoints()[0].radiusY());
+        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());
     }
 }
 
 TEST(WebInputEventConversionTest, InputEventsConversions)
 {
     const std::string baseURL("http://www.test3.com/");
     const std::string fileName("fixed_layout.html");
 
     URLTestHelpers::registerMockedURLFromBaseURL(WebString::fromUTF8(baseURL.c_str()), WebString::fromUTF8("fixed_layout.html"));
     FrameTestHelpers::WebViewHelper webViewHelper;
@@ skipping 13 matching lines @@
         webGestureEvent.type = WebInputEvent::GestureTap;
         webGestureEvent.x = 10;
         webGestureEvent.y = 10;
         webGestureEvent.globalX = 10;
         webGestureEvent.globalY = 10;
         webGestureEvent.data.tap.tapCount = 1;
         webGestureEvent.data.tap.width = 10;
         webGestureEvent.data.tap.height = 10;
 
         PlatformGestureEventBuilder platformGestureBuilder(view, webGestureEvent);
-        EXPECT_EQ(10, platformGestureBuilder.position().x());
-        EXPECT_EQ(10, platformGestureBuilder.position().y());
-        EXPECT_EQ(10, platformGestureBuilder.globalPosition().x());
-        EXPECT_EQ(10, platformGestureBuilder.globalPosition().y());
+        EXPECT_EQ(10.f, platformGestureBuilder.position().x());
+        EXPECT_EQ(10.f, platformGestureBuilder.position().y());
+        EXPECT_EQ(10.f, platformGestureBuilder.globalPosition().x());
+        EXPECT_EQ(10.f, platformGestureBuilder.globalPosition().y());
         EXPECT_EQ(1, platformGestureBuilder.tapCount());
 
         RefPtrWillBeRawPtr<WebCore::GestureEvent> coreGestureEvent = WebCore::GestureEvent::create(domWindow, platformGestureBuilder);
         WebGestureEventBuilder recreatedWebGestureEvent(view, documentRenderView, *coreGestureEvent);
         EXPECT_EQ(webGestureEvent.type, recreatedWebGestureEvent.type);
         EXPECT_EQ(webGestureEvent.x, recreatedWebGestureEvent.x);
         EXPECT_EQ(webGestureEvent.y, recreatedWebGestureEvent.y);
         EXPECT_EQ(webGestureEvent.globalX, recreatedWebGestureEvent.globalX);
         EXPECT_EQ(webGestureEvent.globalY, recreatedWebGestureEvent.globalY);
         EXPECT_EQ(webGestureEvent.data.tap.tapCount, recreatedWebGestureEvent.data.tap.tapCount);
@@ skipping 84 matching lines @@
         webTouchEvent.touches[0].screenPosition.y = 10.4f;
         webTouchEvent.touches[0].position.x = 10.6f;
         webTouchEvent.touches[0].position.y = 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);
 
         PlatformTouchEventBuilder platformTouchBuilder(view, webTouchEvent);
-        EXPECT_EQ(10, platformTouchBuilder.touchPoints()[0].screenPos().x());
-        EXPECT_EQ(10, platformTouchBuilder.touchPoints()[0].screenPos().y());
-        EXPECT_EQ(5 + pinchOffset.x(), platformTouchBuilder.touchPoints()[0].pos().x());
-        EXPECT_EQ(5 + pinchOffset.y(), platformTouchBuilder.touchPoints()[0].pos().y());
+        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 + pinchOffset.x(), platformTouchBuilder.touchPoints()[0].pos().x());
+        EXPECT_FLOAT_EQ(5.2f + pinchOffset.y(), platformTouchBuilder.touchPoints()[0].pos().y());
     }
 }
 
 } // anonymous namespace