Changeset 259025 in webkit

Timestamp:

Mar 25, 2020 5:32:00 PM (4 years ago)

Author:

timothy_horton@apple.com

Message:

Unable to build WebKit with iOS 13.4 SDK
​https://bugs.webkit.org/show_bug.cgi?id=209317

Reviewed by Megan Gardner.

• Platform/spi/ios/UIKitSPI.h:

Stop defining some UIKit SPI that is now API (hurray!).

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• Platform/spi/ios/UIKitSPI.h (modified) (4 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2020-03-25  Tim Horton  <timothy_horton@apple.com>
+
+        Unable to build WebKit with iOS 13.4 SDK
+        https://bugs.webkit.org/show_bug.cgi?id=209317
+
+        Reviewed by Megan Gardner.
+
+        * Platform/spi/ios/UIKitSPI.h:
+        Stop defining some UIKit SPI that is now API (hurray!).
+
 2020-03-25  Per Arne Vollan  <pvollan@apple.com>
 

trunk/Source/WebKit/Platform/spi/ios/UIKitSPI.h

@@ -231 +231 @@
 } UIKeyboardInputFlags;
 
+#if PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED < 130400
 typedef NS_OPTIONS(NSInteger, UIEventButtonMask) {
     UIEventButtonMaskPrimary = 1 << 0,
     UIEventButtonMaskSecondary = 1 << 1,
 };
+#endif
 
 @interface UIEvent ()
@@ -380 +382 @@
 };
 
+#if PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED < 130400
 typedef enum {
     UIAxisNeither = 0,
@@ -386 +389 @@
     UIAxisBoth = (UIAxisHorizontal | UIAxisVertical),
 } UIAxis;
+#endif
 
 @interface UIScrollView ()
@@ -412 +416 @@
 
 @interface UIGestureRecognizer ()
+#if PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED < 130400
 @property (nonatomic, readonly, getter=_modifierFlags) UIKeyModifierFlags modifierFlags;
+#endif
 
 - (void)_hoverEntered:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event;