Title: [207823] trunk/Source/WebKit2
- Revision
- 207823
- Author
- [email protected]
- Date
- 2016-10-25 09:34:32 -0700 (Tue, 25 Oct 2016)
Log Message
Unreviewed, rolling out r207494.
iOS SDK has been updated on the bots now so rollout the
rollout
Reverted changeset:
"Unreviewed, rolling out r207413."
https://bugs.webkit.org/show_bug.cgi?id=163547
http://trac.webkit.org/changeset/207494
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (207822 => 207823)
--- trunk/Source/WebKit2/ChangeLog 2016-10-25 16:26:18 UTC (rev 207822)
+++ trunk/Source/WebKit2/ChangeLog 2016-10-25 16:34:32 UTC (rev 207823)
@@ -1,3 +1,16 @@
+2016-10-25 Chris Dumez <[email protected]>
+
+ Unreviewed, rolling out r207494.
+
+ iOS SDK has been updated on the bots now so rollout the
+ rollout
+
+ Reverted changeset:
+
+ "Unreviewed, rolling out r207413."
+ https://bugs.webkit.org/show_bug.cgi?id=163547
+ http://trac.webkit.org/changeset/207494
+
2016-10-25 Jonathan Bedard <[email protected]>
Unreviewed build fix.
Modified: trunk/Source/WebKit2/Platform/spi/ios/UIKitSPI.h (207822 => 207823)
--- trunk/Source/WebKit2/Platform/spi/ios/UIKitSPI.h 2016-10-25 16:26:18 UTC (rev 207822)
+++ trunk/Source/WebKit2/Platform/spi/ios/UIKitSPI.h 2016-10-25 16:34:32 UTC (rev 207823)
@@ -654,8 +654,7 @@
unsigned identifier;
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;
CGFloat azimuthAngle;
Modified: trunk/Source/WebKit2/Shared/ios/NativeWebTouchEventIOS.mm (207822 => 207823)
--- trunk/Source/WebKit2/Shared/ios/NativeWebTouchEventIOS.mm 2016-10-25 16:26:18 UTC (rev 207822)
+++ trunk/Source/WebKit2/Shared/ios/NativeWebTouchEventIOS.mm 2016-10-25 16:34:32 UTC (rev 207823)
@@ -103,9 +103,8 @@
WebPlatformTouchPoint::TouchPointState phase = convertTouchPhase(touchPoint.phase);
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);
#if defined UI_WEB_TOUCH_EVENT_HAS_STYLUS_DATA && UI_WEB_TOUCH_EVENT_HAS_STYLUS_DATA
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
