Title: [190565] trunk/Tools
- Revision
- 190565
- Author
- [email protected]
- Date
- 2015-10-05 10:58:59 -0700 (Mon, 05 Oct 2015)
Log Message
Fix the iOS 8 build, where -[UIApplication _enqueueHIDEvent:] is not
available, and tidy up the #ifdefs in the UIKitSPI header.
* WebKitTestRunner/ios/HIDEventGenerator.mm:
(-[HIDEventGenerator _sendHIDEvent:]):
* WebKitTestRunner/ios/UIKitSPI.h:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (190564 => 190565)
--- trunk/Tools/ChangeLog 2015-10-05 17:27:16 UTC (rev 190564)
+++ trunk/Tools/ChangeLog 2015-10-05 17:58:59 UTC (rev 190565)
@@ -1,3 +1,12 @@
+2015-10-05 Simon Fraser <[email protected]>
+
+ Fix the iOS 8 build, where -[UIApplication _enqueueHIDEvent:] is not
+ available, and tidy up the #ifdefs in the UIKitSPI header.
+
+ * WebKitTestRunner/ios/HIDEventGenerator.mm:
+ (-[HIDEventGenerator _sendHIDEvent:]):
+ * WebKitTestRunner/ios/UIKitSPI.h:
+
2015-10-04 Zan Dobersek <[email protected]>
[GTK] Remove duplicate entries in WebKitTestRunner_SOURCES
Modified: trunk/Tools/WebKitTestRunner/ios/HIDEventGenerator.mm (190564 => 190565)
--- trunk/Tools/WebKitTestRunner/ios/HIDEventGenerator.mm 2015-10-05 17:27:16 UTC (rev 190564)
+++ trunk/Tools/WebKitTestRunner/ios/HIDEventGenerator.mm 2015-10-05 17:58:59 UTC (rev 190565)
@@ -231,7 +231,9 @@
uint32_t contextID = [UIApplication sharedApplication].keyWindow._contextId;
ASSERT(contextID);
BKSHIDEventSetDigitizerInfo(strongEvent.get(), contextID, false, false, NULL, 0, 0);
+#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000
[[UIApplication sharedApplication] _enqueueHIDEvent:strongEvent.get()];
+#endif
});
}
return YES;
Modified: trunk/Tools/WebKitTestRunner/ios/UIKitSPI.h (190564 => 190565)
--- trunk/Tools/WebKitTestRunner/ios/UIKitSPI.h 2015-10-05 17:27:16 UTC (rev 190564)
+++ trunk/Tools/WebKitTestRunner/ios/UIKitSPI.h 2015-10-05 17:58:59 UTC (rev 190565)
@@ -23,6 +23,13 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
+#ifndef UIKitSPI_h
+#define UIKitSPI_h
+
+#import <wtf/Platform.h>
+
+#if PLATFORM(IOS)
+
#import <UIKit/UIKit.h>
#if USE(APPLE_INTERNAL_SDK)
@@ -35,7 +42,9 @@
#import "IOKitSPI.h"
@interface UIApplication ()
+#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000
- (void)_enqueueHIDEvent:(IOHIDEventRef)event;
+#endif
- (void)_handleHIDEvent:(IOHIDEventRef)event;
@end
@@ -43,4 +52,8 @@
- (uint32_t)_contextId;
@end
-#endif
+#endif // USE(APPLE_INTERNAL_SDK)
+
+#endif // PLATFORM(IOS)
+
+#endif // UIKitSPI_h
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
