Unreviewed, try to fix the iOS 8 build after r190368.
authorbburg@apple.com <bburg@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 7 Oct 2015 00:05:37 +0000 (00:05 +0000)
committerbburg@apple.com <bburg@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 7 Oct 2015 00:05:37 +0000 (00:05 +0000)
On older versions, IOHIDEventCreateForceEvent is not available.

* WebKitTestRunner/ios/HIDEventGenerator.mm:
(-[HIDEventGenerator _createIOHIDEventType:]): Add another guard for force events.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@190652 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Tools/ChangeLog
Tools/WebKitTestRunner/ios/HIDEventGenerator.mm

index e4d35a4..ed6df6d 100644 (file)
@@ -1,3 +1,12 @@
+2015-10-06  Brian Burg  <bburg@apple.com>
+
+        Unreviewed, try to fix the iOS 8 build after r190368.
+
+        On older versions, IOHIDEventCreateForceEvent is not available.
+
+        * WebKitTestRunner/ios/HIDEventGenerator.mm:
+        (-[HIDEventGenerator _createIOHIDEventType:]): Add another guard for force events.
+
 2015-10-06  Keith Miller  <keith_miller@apple.com>
 
         Add gmalloc option to run-javascriptcore-tests.
index 138e43a..7a0d0fb 100644 (file)
@@ -205,6 +205,7 @@ static void delayBetweenMove(int eventIndex, double elapsed)
         IOHIDEventAppendEvent(eventRef.get(), subEvent.get(), 0);
     }
 
+#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000
     if (_activePointCount) {
         IOHIDFloat progress = _activePoints[0].pathPressure;
         RetainPtr<IOHIDEventRef> forceEvent = adoptCF(IOHIDEventCreateForceEvent(kCFAllocatorDefault,
@@ -216,6 +217,7 @@ static void delayBetweenMove(int eventIndex, double elapsed)
             kIOHIDEventOptionNone));
         IOHIDEventAppendEvent(eventRef.get(), forceEvent.get(), 0);
     }
+#endif
 
     return eventRef.leakRef();
 }