Title: [259025] trunk/Source/WebKit
Revision
259025
Author
timothy_hor...@apple.com
Date
2020-03-25 17:32:00 -0700 (Wed, 25 Mar 2020)

Log 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!).

Modified Paths

Diff

Modified: trunk/Source/WebKit/ChangeLog (259024 => 259025)


--- trunk/Source/WebKit/ChangeLog	2020-03-26 00:28:36 UTC (rev 259024)
+++ trunk/Source/WebKit/ChangeLog	2020-03-26 00:32:00 UTC (rev 259025)
@@ -1,3 +1,13 @@
+2020-03-25  Tim Horton  <timothy_hor...@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  <pvol...@apple.com>
 
         [macOS] Fix sandbox violations related to media playback

Modified: trunk/Source/WebKit/Platform/spi/ios/UIKitSPI.h (259024 => 259025)


--- trunk/Source/WebKit/Platform/spi/ios/UIKitSPI.h	2020-03-26 00:28:36 UTC (rev 259024)
+++ trunk/Source/WebKit/Platform/spi/ios/UIKitSPI.h	2020-03-26 00:32:00 UTC (rev 259025)
@@ -230,10 +230,12 @@
     kUIKeyboardInputPreProcessed           = 1 << 7,
 } UIKeyboardInputFlags;
 
+#if PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED < 130400
 typedef NS_OPTIONS(NSInteger, UIEventButtonMask) {
     UIEventButtonMaskPrimary = 1 << 0,
     UIEventButtonMaskSecondary = 1 << 1,
 };
+#endif
 
 @interface UIEvent ()
 - (void *)_hidEvent;
@@ -379,6 +381,7 @@
     UIScrollViewIndicatorInsetAdjustmentNever
 };
 
+#if PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED < 130400
 typedef enum {
     UIAxisNeither = 0,
     UIAxisHorizontal = 1 << 0,
@@ -385,6 +388,7 @@
     UIAxisVertical = 1 << 1,
     UIAxisBoth = (UIAxisHorizontal | UIAxisVertical),
 } UIAxis;
+#endif
 
 @interface UIScrollView ()
 - (void)_stopScrollingAndZoomingAnimations;
@@ -411,7 +415,9 @@
 @end
 
 @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;
 - (void)_hoverMoved:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to