Changeset 207413 in webkit

Timestamp:

Oct 17, 2016 10:48:28 AM (8 years ago)

Author:

Chris Dumez

Message:

[iOS] Hook up WebPlatformTouchPoint's radiusX / radiusY to _UIWebTouchPoint.majorRadiusInScreenCoordinates
​https://bugs.webkit.org/show_bug.cgi?id=163547

Reviewed by Darin Adler.

Hook up WebPlatformTouchPoint's radiusX / radiusY to _UIWebTouchPoint.majorRadiusInScreenCoordinates
now that it is available in UIKit.

• Platform/spi/ios/UIKitSPI.h:
• Shared/ios/NativeWebTouchEventIOS.mm:

(WebKit::NativeWebTouchEvent::extractWebTouchPoint):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Platform/spi/ios/UIKitSPI.h (modified) (1 diff)
• Shared/ios/NativeWebTouchEventIOS.mm (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2016-10-17  Chris Dumez  <cdumez@apple.com>
+
+        [iOS] Hook up WebPlatformTouchPoint's radiusX / radiusY to _UIWebTouchPoint.majorRadiusInScreenCoordinates
+        https://bugs.webkit.org/show_bug.cgi?id=163547
+
+        Reviewed by Darin Adler.
+
+        Hook up WebPlatformTouchPoint's radiusX / radiusY to _UIWebTouchPoint.majorRadiusInScreenCoordinates
+        now that it is available in UIKit.
+
+        * Platform/spi/ios/UIKitSPI.h:
+        * Shared/ios/NativeWebTouchEventIOS.mm:
+        (WebKit::NativeWebTouchEvent::extractWebTouchPoint):
+
 2016-10-17  Konstantin Tokarev  <annulen@yandex.ru>
 

trunk/Source/WebKit2/Platform/spi/ios/UIKitSPI.h

@@ -655 +655 @@
     UITouchPhase phase;
 #if __IPHONE_OS_VERSION_MIN_REQUIRED > 100000
-    // FIXME: Uncomment this once UIKit is updated (rdar://problem/28555313).
-    // CGFloat majorRadiusInScreenCoordinates;
+    CGFloat majorRadiusInScreenCoordinates;
     CGFloat force;
     CGFloat altitudeAngle;

trunk/Source/WebKit2/Shared/ios/NativeWebTouchEventIOS.mm

@@ -104 +104 @@
         WebPlatformTouchPoint platformTouchPoint = WebPlatformTouchPoint(identifier, location, phase);
 #if ENABLE(IOS_TOUCH_EVENTS)
-        // FIXME: We should use touchPoint.majorRadiusInScreenCoordinates for radiusX / radiusY once it is available (rdar://problem/28555313).
-        platformTouchPoint.setRadiusX(0);
-        platformTouchPoint.setRadiusY(0);
+        platformTouchPoint.setRadiusX(touchPoint.majorRadiusInScreenCoordinates);
+        platformTouchPoint.setRadiusY(touchPoint.majorRadiusInScreenCoordinates);
         platformTouchPoint.setRotationAngle(0); // Not available in _UIWebTouchEvent yet.
         platformTouchPoint.setForce(touchPoint.force);