Modified: branches/safari-613.1.8-branch/Source/WebCore/PAL/ChangeLog (285819 => 285820)
--- branches/safari-613.1.8-branch/Source/WebCore/PAL/ChangeLog 2021-11-15 19:46:12 UTC (rev 285819)
+++ branches/safari-613.1.8-branch/Source/WebCore/PAL/ChangeLog 2021-11-15 20:15:22 UTC (rev 285820)
@@ -1,3 +1,32 @@
+2021-11-15 Alan Coon <[email protected]>
+
+ Cherry-pick r285744. rdar://problem/85422144
+
+ Stop statically declaring various UIFoundation constants in NSAttributedStringSPI.h
+ https://bugs.webkit.org/show_bug.cgi?id=233064
+ rdar://85341122
+
+ Reviewed by Tim Horton.
+
+ Replace these static NSString definitions with soft-linked constants instead.
+
+ * pal/spi/cocoa/NSAttributedStringSPI.h:
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@285744 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2021-11-12 Wenson Hsieh <[email protected]>
+
+ Stop statically declaring various UIFoundation constants in NSAttributedStringSPI.h
+ https://bugs.webkit.org/show_bug.cgi?id=233064
+ rdar://85341122
+
+ Reviewed by Tim Horton.
+
+ Replace these static NSString definitions with soft-linked constants instead.
+
+ * pal/spi/cocoa/NSAttributedStringSPI.h:
+
2021-11-04 Dean Jackson <[email protected]>
REGRESSION: AR Quicklook asset is shared instead of page URL
Modified: branches/safari-613.1.8-branch/Source/WebCore/PAL/pal/spi/cocoa/NSAttributedStringSPI.h (285819 => 285820)
--- branches/safari-613.1.8-branch/Source/WebCore/PAL/pal/spi/cocoa/NSAttributedStringSPI.h 2021-11-15 19:46:12 UTC (rev 285819)
+++ branches/safari-613.1.8-branch/Source/WebCore/PAL/pal/spi/cocoa/NSAttributedStringSPI.h 2021-11-15 20:15:22 UTC (rev 285820)
@@ -95,6 +95,32 @@
#define NSMarkedClauseSegmentAttributeName getNSMarkedClauseSegmentAttributeName()
SOFT_LINK_CONSTANT(UIFoundation, NSTextAlternativesAttributeName, NSString *)
#define NSTextAlternativesAttributeName getNSTextAlternativesAttributeName()
+SOFT_LINK_CONSTANT(UIFoundation, NSTextListMarkerCircle, NSString *)
+#define NSTextListMarkerCircle getNSTextListMarkerCircle()
+SOFT_LINK_CONSTANT(UIFoundation, NSTextListMarkerDisc, NSString *)
+#define NSTextListMarkerDisc getNSTextListMarkerDisc()
+SOFT_LINK_CONSTANT(UIFoundation, NSTextListMarkerSquare, NSString *)
+#define NSTextListMarkerSquare getNSTextListMarkerSquare()
+SOFT_LINK_CONSTANT(UIFoundation, NSTextListMarkerLowercaseHexadecimal, NSString *)
+#define NSTextListMarkerLowercaseHexadecimal getNSTextListMarkerLowercaseHexadecimal()
+SOFT_LINK_CONSTANT(UIFoundation, NSTextListMarkerUppercaseHexadecimal, NSString *)
+#define NSTextListMarkerUppercaseHexadecimal getNSTextListMarkerUppercaseHexadecimal()
+SOFT_LINK_CONSTANT(UIFoundation, NSTextListMarkerOctal, NSString *)
+#define NSTextListMarkerOctal getNSTextListMarkerOctal()
+SOFT_LINK_CONSTANT(UIFoundation, NSTextListMarkerLowercaseAlpha, NSString *)
+#define NSTextListMarkerLowercaseAlpha getNSTextListMarkerLowercaseAlpha()
+SOFT_LINK_CONSTANT(UIFoundation, NSTextListMarkerUppercaseAlpha, NSString *)
+#define NSTextListMarkerUppercaseAlpha getNSTextListMarkerUppercaseAlpha()
+SOFT_LINK_CONSTANT(UIFoundation, NSTextListMarkerLowercaseLatin, NSString *)
+#define NSTextListMarkerLowercaseLatin getNSTextListMarkerLowercaseLatin()
+SOFT_LINK_CONSTANT(UIFoundation, NSTextListMarkerUppercaseLatin, NSString *)
+#define NSTextListMarkerUppercaseLatin getNSTextListMarkerUppercaseLatin()
+SOFT_LINK_CONSTANT(UIFoundation, NSTextListMarkerLowercaseRoman, NSString *)
+#define NSTextListMarkerLowercaseRoman getNSTextListMarkerLowercaseRoman()
+SOFT_LINK_CONSTANT(UIFoundation, NSTextListMarkerUppercaseRoman, NSString *)
+#define NSTextListMarkerUppercaseRoman getNSTextListMarkerUppercaseRoman()
+SOFT_LINK_CONSTANT(UIFoundation, NSTextListMarkerDecimal, NSString *)
+#define NSTextListMarkerDecimal getNSTextListMarkerDecimal()
// We don't softlink NSSuperscriptAttributeName because UIFoundation stopped exporting it.
// This attribute is being deprecated at the API level, but internally UIFoundation
@@ -111,18 +137,4 @@
- (BOOL)containsAttachments;
@end
-static NSString *const NSTextListMarkerCircle = @"{circle}";
-static NSString *const NSTextListMarkerDisc = @"{disc}";
-static NSString *const NSTextListMarkerSquare = @"{square}";
-static NSString *const NSTextListMarkerLowercaseHexadecimal = @"{lower-hexadecimal}";
-static NSString *const NSTextListMarkerUppercaseHexadecimal = @"{upper-hexadecimal}";
-static NSString *const NSTextListMarkerOctal = @"{octal}";
-static NSString *const NSTextListMarkerLowercaseAlpha = @"{lower-alpha}";
-static NSString *const NSTextListMarkerUppercaseAlpha = @"{upper-alpha}";
-static NSString *const NSTextListMarkerLowercaseLatin = @"{lower-latin}";
-static NSString *const NSTextListMarkerUppercaseLatin = @"{upper-latin}";
-static NSString *const NSTextListMarkerLowercaseRoman = @"{lower-roman}";
-static NSString *const NSTextListMarkerUppercaseRoman = @"{upper-roman}";
-static NSString *const NSTextListMarkerDecimal = @"{decimal}";
-
#endif // PLATFORM(IOS_FAMILY)
