⚠ Archived content — this site is no longer maintained.   Current WebKit documentation is at docs.webkit.org.

Changeset 285820 in webkit


Ignore:
Timestamp:
Nov 15, 2021, 12:15:22 PM (5 years ago)
Author:
Russell Epstein
Message:

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

Location:
branches/safari-613.1.8-branch/Source/WebCore/PAL
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • branches/safari-613.1.8-branch/Source/WebCore/PAL/ChangeLog

    r285319 r285820  
     12021-11-15  Alan Coon  <alancoon@apple.com>
     2
     3        Cherry-pick r285744. rdar://problem/85422144
     4
     5    Stop statically declaring various UIFoundation constants in NSAttributedStringSPI.h
     6    https://bugs.webkit.org/show_bug.cgi?id=233064
     7    rdar://85341122
     8   
     9    Reviewed by Tim Horton.
     10   
     11    Replace these static NSString definitions with soft-linked constants instead.
     12   
     13    * pal/spi/cocoa/NSAttributedStringSPI.h:
     14   
     15   
     16    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@285744 268f45cc-cd09-0410-ab3c-d52691b4dbfc
     17
     18    2021-11-12  Wenson Hsieh  <wenson_hsieh@apple.com>
     19
     20            Stop statically declaring various UIFoundation constants in NSAttributedStringSPI.h
     21            https://bugs.webkit.org/show_bug.cgi?id=233064
     22            rdar://85341122
     23
     24            Reviewed by Tim Horton.
     25
     26            Replace these static NSString definitions with soft-linked constants instead.
     27
     28            * pal/spi/cocoa/NSAttributedStringSPI.h:
     29
    1302021-11-04  Dean Jackson  <dino@apple.com>
    231

  • branches/safari-613.1.8-branch/Source/WebCore/PAL/pal/spi/cocoa/NSAttributedStringSPI.h

    r261138 r285820  
    9696SOFT_LINK_CONSTANT(UIFoundation, NSTextAlternativesAttributeName, NSString *)
    9797#define NSTextAlternativesAttributeName getNSTextAlternativesAttributeName()
     98SOFT_LINK_CONSTANT(UIFoundation, NSTextListMarkerCircle, NSString *)
     99#define NSTextListMarkerCircle getNSTextListMarkerCircle()
     100SOFT_LINK_CONSTANT(UIFoundation, NSTextListMarkerDisc, NSString *)
     101#define NSTextListMarkerDisc getNSTextListMarkerDisc()
     102SOFT_LINK_CONSTANT(UIFoundation, NSTextListMarkerSquare, NSString *)
     103#define NSTextListMarkerSquare getNSTextListMarkerSquare()
     104SOFT_LINK_CONSTANT(UIFoundation, NSTextListMarkerLowercaseHexadecimal, NSString *)
     105#define NSTextListMarkerLowercaseHexadecimal getNSTextListMarkerLowercaseHexadecimal()
     106SOFT_LINK_CONSTANT(UIFoundation, NSTextListMarkerUppercaseHexadecimal, NSString *)
     107#define NSTextListMarkerUppercaseHexadecimal getNSTextListMarkerUppercaseHexadecimal()
     108SOFT_LINK_CONSTANT(UIFoundation, NSTextListMarkerOctal, NSString *)
     109#define NSTextListMarkerOctal getNSTextListMarkerOctal()
     110SOFT_LINK_CONSTANT(UIFoundation, NSTextListMarkerLowercaseAlpha, NSString *)
     111#define NSTextListMarkerLowercaseAlpha getNSTextListMarkerLowercaseAlpha()
     112SOFT_LINK_CONSTANT(UIFoundation, NSTextListMarkerUppercaseAlpha, NSString *)
     113#define NSTextListMarkerUppercaseAlpha getNSTextListMarkerUppercaseAlpha()
     114SOFT_LINK_CONSTANT(UIFoundation, NSTextListMarkerLowercaseLatin, NSString *)
     115#define NSTextListMarkerLowercaseLatin getNSTextListMarkerLowercaseLatin()
     116SOFT_LINK_CONSTANT(UIFoundation, NSTextListMarkerUppercaseLatin, NSString *)
     117#define NSTextListMarkerUppercaseLatin getNSTextListMarkerUppercaseLatin()
     118SOFT_LINK_CONSTANT(UIFoundation, NSTextListMarkerLowercaseRoman, NSString *)
     119#define NSTextListMarkerLowercaseRoman getNSTextListMarkerLowercaseRoman()
     120SOFT_LINK_CONSTANT(UIFoundation, NSTextListMarkerUppercaseRoman, NSString *)
     121#define NSTextListMarkerUppercaseRoman getNSTextListMarkerUppercaseRoman()
     122SOFT_LINK_CONSTANT(UIFoundation, NSTextListMarkerDecimal, NSString *)
     123#define NSTextListMarkerDecimal getNSTextListMarkerDecimal()
    98124
    99125// We don't softlink NSSuperscriptAttributeName because UIFoundation stopped exporting it.
    … …  
    112138@end
    113139
    114 static NSString *const NSTextListMarkerCircle = @"{circle}";
    115 static NSString *const NSTextListMarkerDisc = @"{disc}";
    116 static NSString *const NSTextListMarkerSquare = @"{square}";
    117 static NSString *const NSTextListMarkerLowercaseHexadecimal = @"{lower-hexadecimal}";
    118 static NSString *const NSTextListMarkerUppercaseHexadecimal = @"{upper-hexadecimal}";
    119 static NSString *const NSTextListMarkerOctal = @"{octal}";
    120 static NSString *const NSTextListMarkerLowercaseAlpha = @"{lower-alpha}";
    121 static NSString *const NSTextListMarkerUppercaseAlpha = @"{upper-alpha}";
    122 static NSString *const NSTextListMarkerLowercaseLatin = @"{lower-latin}";
    123 static NSString *const NSTextListMarkerUppercaseLatin = @"{upper-latin}";
    124 static NSString *const NSTextListMarkerLowercaseRoman = @"{lower-roman}";
    125 static NSString *const NSTextListMarkerUppercaseRoman = @"{upper-roman}";
    126 static NSString *const NSTextListMarkerDecimal = @"{decimal}";
    127 
    128140#endif // PLATFORM(IOS_FAMILY)
Note: See TracChangeset for help on using the changeset viewer.