Title: [285845] branches/safari-613.1.9-branch/Source
- Revision
- 285845
- Author
- [email protected]
- Date
- 2021-11-15 17:42:20 -0800 (Mon, 15 Nov 2021)
Log Message
Cherry-pick r285828. rdar://problem/85341122
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:
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@285828 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-613.1.9-branch/Source/WTF/ChangeLog (285844 => 285845)
--- branches/safari-613.1.9-branch/Source/WTF/ChangeLog 2021-11-16 01:42:16 UTC (rev 285844)
+++ branches/safari-613.1.9-branch/Source/WTF/ChangeLog 2021-11-16 01:42:20 UTC (rev 285845)
@@ -1,3 +1,33 @@
+2021-11-15 Russell Epstein <[email protected]>
+
+ Cherry-pick r285828. rdar://problem/85341122
+
+ 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:
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@285828 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2021-11-15 Wenson Hsieh <[email protected]>
+
+ Unreviewed, fix the internal iOS 15 build
+
+ Add a new compile-time flag.
+
+ * wtf/PlatformHave.h:
+
2021-11-13 Simon Fraser <[email protected]>
Run a ScrollAnimationMomentum for the momentum phase of a scroll
Modified: branches/safari-613.1.9-branch/Source/WTF/wtf/PlatformHave.h (285844 => 285845)
--- branches/safari-613.1.9-branch/Source/WTF/wtf/PlatformHave.h 2021-11-16 01:42:16 UTC (rev 285844)
+++ branches/safari-613.1.9-branch/Source/WTF/wtf/PlatformHave.h 2021-11-16 01:42:20 UTC (rev 285845)
@@ -1090,3 +1090,10 @@
|| (PLATFORM(WATCHOS) && __WATCH_OS_VERSION_MAX_ALLOWED >= 80400)
#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
Modified: branches/safari-613.1.9-branch/Source/WebCore/PAL/ChangeLog (285844 => 285845)
--- branches/safari-613.1.9-branch/Source/WebCore/PAL/ChangeLog 2021-11-16 01:42:16 UTC (rev 285844)
+++ branches/safari-613.1.9-branch/Source/WebCore/PAL/ChangeLog 2021-11-16 01:42:20 UTC (rev 285845)
@@ -1,5 +1,37 @@
2021-11-15 Russell Epstein <[email protected]>
+ Cherry-pick r285828. rdar://problem/85341122
+
+ 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:
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@285828 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2021-11-15 Wenson Hsieh <[email protected]>
+
+ 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 Russell Epstein <[email protected]>
+
Cherry-pick r285811. rdar://problem/85341122
Declare NSTextListMarker* as type NSTextListMarkerFormat when soft-linking
Modified: branches/safari-613.1.9-branch/Source/WebCore/PAL/pal/spi/cocoa/NSAttributedStringSPI.h (285844 => 285845)
--- branches/safari-613.1.9-branch/Source/WebCore/PAL/pal/spi/cocoa/NSAttributedStringSPI.h 2021-11-16 01:42:16 UTC (rev 285844)
+++ branches/safari-613.1.9-branch/Source/WebCore/PAL/pal/spi/cocoa/NSAttributedStringSPI.h 2021-11-16 01:42:20 UTC (rev 285845)
@@ -96,11 +96,12 @@
SOFT_LINK_CONSTANT(UIFoundation, NSTextAlternativesAttributeName, NSString *)
#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()
SOFT_LINK_CONSTANT(UIFoundation, NSTextListMarkerDisc, NSTextListMarkerFormat)
@@ -127,6 +128,22 @@
#define NSTextListMarkerUppercaseRoman getNSTextListMarkerUppercaseRoman()
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.
// This attribute is being deprecated at the API level, but internally UIFoundation
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
