Title: [207494] trunk/Source/WebKit2
Revision
207494
Author
ryanhad...@apple.com
Date
2016-10-18 15:33:35 -0700 (Tue, 18 Oct 2016)

Log Message

Unreviewed, rolling out r207413.

This change broke iOS builds.

Reverted changeset:

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

Modified Paths

Diff

Modified: trunk/Source/WebKit2/ChangeLog (207493 => 207494)


--- trunk/Source/WebKit2/ChangeLog	2016-10-18 22:28:31 UTC (rev 207493)
+++ trunk/Source/WebKit2/ChangeLog	2016-10-18 22:33:35 UTC (rev 207494)
@@ -1,3 +1,16 @@
+2016-10-18  Ryan Haddad  <ryanhad...@apple.com>
+
+        Unreviewed, rolling out r207413.
+
+        This change broke iOS builds.
+
+        Reverted changeset:
+
+        "[iOS] Hook up WebPlatformTouchPoint's radiusX / radiusY to
+        _UIWebTouchPoint.majorRadiusInScreenCoordinates"
+        https://bugs.webkit.org/show_bug.cgi?id=163547
+        http://trac.webkit.org/changeset/207413
+
 2016-10-18  Commit Queue  <commit-qu...@webkit.org>
 
         Unreviewed, rolling out r207443.

Modified: trunk/Source/WebKit2/Platform/spi/ios/UIKitSPI.h (207493 => 207494)


--- trunk/Source/WebKit2/Platform/spi/ios/UIKitSPI.h	2016-10-18 22:28:31 UTC (rev 207493)
+++ trunk/Source/WebKit2/Platform/spi/ios/UIKitSPI.h	2016-10-18 22:33:35 UTC (rev 207494)
@@ -654,7 +654,8 @@
     unsigned identifier;
     UITouchPhase phase;
 #if __IPHONE_OS_VERSION_MIN_REQUIRED > 100000
-    CGFloat majorRadiusInScreenCoordinates;
+    // FIXME: Uncomment this once UIKit is updated (rdar://problem/28555313).
+    // CGFloat majorRadiusInScreenCoordinates;
     CGFloat force;
     CGFloat altitudeAngle;
     CGFloat azimuthAngle;

Modified: trunk/Source/WebKit2/Shared/ios/NativeWebTouchEventIOS.mm (207493 => 207494)


--- trunk/Source/WebKit2/Shared/ios/NativeWebTouchEventIOS.mm	2016-10-18 22:28:31 UTC (rev 207493)
+++ trunk/Source/WebKit2/Shared/ios/NativeWebTouchEventIOS.mm	2016-10-18 22:33:35 UTC (rev 207494)
@@ -103,8 +103,9 @@
         WebPlatformTouchPoint::TouchPointState phase = convertTouchPhase(touchPoint.phase);
         WebPlatformTouchPoint platformTouchPoint = WebPlatformTouchPoint(identifier, location, phase);
 #if ENABLE(IOS_TOUCH_EVENTS)
-        platformTouchPoint.setRadiusX(touchPoint.majorRadiusInScreenCoordinates);
-        platformTouchPoint.setRadiusY(touchPoint.majorRadiusInScreenCoordinates);
+        // FIXME: We should use touchPoint.majorRadiusInScreenCoordinates for radiusX / radiusY once it is available (rdar://problem/28555313).
+        platformTouchPoint.setRadiusX(0);
+        platformTouchPoint.setRadiusY(0);
         platformTouchPoint.setRotationAngle(0); // Not available in _UIWebTouchEvent yet.
         platformTouchPoint.setForce(touchPoint.force);
 #if defined UI_WEB_TOUCH_EVENT_HAS_STYLUS_DATA && UI_WEB_TOUCH_EVENT_HAS_STYLUS_DATA
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to