Swipe tests fail on Mavericks

https://bugs.webkit.org/show_bug.cgi?id=148752

Reviewed by Beth Dakin.

* WebKitTestRunner/mac/EventSenderProxy.mm:

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

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 904c1c8..833efbb 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,5 +1,14 @@
 2015-09-03  Tim Horton  <timothy_horton@apple.com>
 
+        Swipe tests fail on Mavericks
+        https://bugs.webkit.org/show_bug.cgi?id=148752
+
+        Reviewed by Beth Dakin.
+
+        * WebKitTestRunner/mac/EventSenderProxy.mm:
+
+2015-09-03  Tim Horton  <timothy_horton@apple.com>
+
         Fix the 32-bit build
 
         * WebKitTestRunner/mac/PlatformWebViewMac.mm:

diff --git a/Tools/WebKitTestRunner/mac/EventSenderProxy.mm b/Tools/WebKitTestRunner/mac/EventSenderProxy.mm
index 71198a4..7ba1cc8 100644 (file)
--- a/Tools/WebKitTestRunner/mac/EventSenderProxy.mm
+++ b/Tools/WebKitTestRunner/mac/EventSenderProxy.mm
@@ -41,6 +41,7 @@
 @end
 
 #if defined(__LP64__)
+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
 struct WKTRCGSEventRecord {
     char offset1[150];
     uint8_t phase;
@@ -49,6 +50,16 @@ struct WKTRCGSEventRecord {
     float deltaY;
     char offset3[76];
 } __attribute__((packed));
+#else
+struct WKTRCGSEventRecord {
+    char offset1[154];
+    uint8_t phase;
+    char offset2[5];
+    float deltaX;
+    float deltaY;
+    char offset3[80];
+} __attribute__((packed));
+#endif
 #endif
 
 @interface EventSenderSyntheticEvent : NSEvent {
@@ -106,7 +117,7 @@ struct WKTRCGSEventRecord {
     return _eventSender_type;
 }
 
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 10100
+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
 - (NSEventSubtype)subtype
 {
     return (NSEventSubtype)_eventSender_subtype;