Changeset 285828 in webkit

Timestamp:

Nov 15, 2021, 1:40:08 PM (5 years ago)

Author:

Wenson Hsieh

Message:

Unreviewed, fix the internal iOS 15 build

Source/WebCore/PAL:

In the internal iOS 15 SDK, <UIKit/NSTextList.h> does not define NSTextListMarkerFormat. Add a separate SDK
version check instead and only attempt to soft-link these constants if we're compiling against an SDK that we
know exports these symbols.

• pal/spi/cocoa/NSAttributedStringSPI.h:

Source/WTF:

Add a new compile-time flag.

• wtf/PlatformHave.h:

Location:

trunk/Source

Files:

• WTF/ChangeLog (modified) (1 diff)
• WTF/wtf/PlatformHave.h (modified) (1 diff)
• WebCore/PAL/ChangeLog (modified) (1 diff)
• WebCore/PAL/pal/spi/cocoa/NSAttributedStringSPI.h (modified) (2 diffs)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2021-11-15  Wenson Hsieh  <wenson_hsieh@apple.com>
+
+        Unreviewed, fix the internal iOS 15 build
+
+        Add a new compile-time flag.
+
+        * wtf/PlatformHave.h:
+
 2021-11-13  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WTF/wtf/PlatformHave.h

@@ -1091 +1091 @@
 #define HAVE_AUDIOSESSION_PROCESSASSERTION 1
 #endif
+
+#if (PLATFORM(MAC) \
+    || ((PLATFORM(IOS) || PLATFORM(MACCATALYST)) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 160000) \
+    || (PLATFORM(WATCHOS) && __WATCH_OS_VERSION_MAX_ALLOWED >= 90000) \
+    || (PLATFORM(APPLETV) && __TV_OS_VERSION_MAX_ALLOWED >= 160000))
+#define HAVE_NSTEXTLIST_MARKER_FORMATS 1
+#endif

trunk/Source/WebCore/PAL/ChangeLog

@@ +1 @@
+2021-11-15  Wenson Hsieh  <wenson_hsieh@apple.com>
+
+        Unreviewed, fix the internal iOS 15 build
+
+        In the internal iOS 15 SDK, <UIKit/NSTextList.h> does not define NSTextListMarkerFormat. Add a separate SDK
+        version check instead and only attempt to soft-link these constants if we're compiling against an SDK that we
+        know exports these symbols.
+
+        * pal/spi/cocoa/NSAttributedStringSPI.h:
+
 2021-11-15  Wenson Hsieh  <wenson_hsieh@apple.com>
 

trunk/Source/WebCore/PAL/pal/spi/cocoa/NSAttributedStringSPI.h

@@ -97 +97 @@
 #define NSTextAlternativesAttributeName getNSTextAlternativesAttributeName()
 
-#if __has_include(<UIKit/NSTextList.h>)
+#if HAVE(NSTEXTLIST_MARKER_FORMATS)
+#if USE(APPLE_INTERNAL_SDK)
 #import <UIKit/NSTextList.h>
 #else
 typedef NSString *NSTextListMarkerFormat;
-#endif
+#endif // USE(APPLE_INTERNAL_SDK)
 SOFT_LINK_CONSTANT(UIFoundation, NSTextListMarkerCircle, NSTextListMarkerFormat)
 #define NSTextListMarkerCircle getNSTextListMarkerCircle()
@@ -128 +129 @@
 SOFT_LINK_CONSTANT(UIFoundation, NSTextListMarkerDecimal, NSTextListMarkerFormat)
 #define NSTextListMarkerDecimal getNSTextListMarkerDecimal()
+#else
+typedef NSString *NSTextListMarkerFormat;
+static NSTextListMarkerFormat const NSTextListMarkerCircle = @"{circle}";
+static NSTextListMarkerFormat const NSTextListMarkerDisc = @"{disc}";
+static NSTextListMarkerFormat const NSTextListMarkerSquare = @"{square}";
+static NSTextListMarkerFormat const NSTextListMarkerLowercaseHexadecimal = @"{lower-hexadecimal}";
+static NSTextListMarkerFormat const NSTextListMarkerUppercaseHexadecimal = @"{upper-hexadecimal}";
+static NSTextListMarkerFormat const NSTextListMarkerOctal = @"{octal}";
+static NSTextListMarkerFormat const NSTextListMarkerLowercaseAlpha = @"{lower-alpha}";
+static NSTextListMarkerFormat const NSTextListMarkerUppercaseAlpha = @"{upper-alpha}";
+static NSTextListMarkerFormat const NSTextListMarkerLowercaseLatin = @"{lower-latin}";
+static NSTextListMarkerFormat const NSTextListMarkerUppercaseLatin = @"{upper-latin}";
+static NSTextListMarkerFormat const NSTextListMarkerLowercaseRoman = @"{lower-roman}";
+static NSTextListMarkerFormat const NSTextListMarkerUppercaseRoman = @"{upper-roman}";
+static NSTextListMarkerFormat const NSTextListMarkerDecimal = @"{decimal}";
+#endif // HAVE(NSTEXTLIST_MARKER_FORMATS)
 
 // We don't softlink NSSuperscriptAttributeName because UIFoundation stopped exporting it.