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

Changeset 285845 in webkit


Ignore:
Timestamp:
Nov 15, 2021, 5:42:20 PM (5 years ago)
Author:
Russell Epstein
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

Location:
branches/safari-613.1.9-branch/Source
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • branches/safari-613.1.9-branch/Source/WTF/ChangeLog

    r285787 r285845  
     12021-11-15  Russell Epstein  <repstein@apple.com>
     2
     3        Cherry-pick r285828. rdar://problem/85341122
     4
     5    Unreviewed, fix the internal iOS 15 build
     6   
     7    Source/WebCore/PAL:
     8   
     9    In the internal iOS 15 SDK, <UIKit/NSTextList.h> does not define NSTextListMarkerFormat. Add a separate SDK
     10    version check instead and only attempt to soft-link these constants if we're compiling against an SDK that we
     11    know exports these symbols.
     12   
     13    * pal/spi/cocoa/NSAttributedStringSPI.h:
     14   
     15    Source/WTF:
     16   
     17    Add a new compile-time flag.
     18   
     19    * wtf/PlatformHave.h:
     20   
     21    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@285828 268f45cc-cd09-0410-ab3c-d52691b4dbfc
     22
     23    2021-11-15  Wenson Hsieh  <wenson_hsieh@apple.com>
     24
     25            Unreviewed, fix the internal iOS 15 build
     26
     27            Add a new compile-time flag.
     28
     29            * wtf/PlatformHave.h:
     30
    1312021-11-13  Simon Fraser  <simon.fraser@apple.com>
    232

  • branches/safari-613.1.9-branch/Source/WTF/wtf/PlatformHave.h

    r285726 r285845  
    10911091#define HAVE_AUDIOSESSION_PROCESSASSERTION 1
    10921092#endif
     1093
     1094#if (PLATFORM(MAC) \
     1095    || ((PLATFORM(IOS) || PLATFORM(MACCATALYST)) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 160000) \
     1096    || (PLATFORM(WATCHOS) && __WATCH_OS_VERSION_MAX_ALLOWED >= 90000) \
     1097    || (PLATFORM(APPLETV) && __TV_OS_VERSION_MAX_ALLOWED >= 160000))
     1098#define HAVE_NSTEXTLIST_MARKER_FORMATS 1
     1099#endif

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

    r285844 r285845  
     12021-11-15  Russell Epstein  <repstein@apple.com>
     2
     3        Cherry-pick r285828. rdar://problem/85341122
     4
     5    Unreviewed, fix the internal iOS 15 build
     6   
     7    Source/WebCore/PAL:
     8   
     9    In the internal iOS 15 SDK, <UIKit/NSTextList.h> does not define NSTextListMarkerFormat. Add a separate SDK
     10    version check instead and only attempt to soft-link these constants if we're compiling against an SDK that we
     11    know exports these symbols.
     12   
     13    * pal/spi/cocoa/NSAttributedStringSPI.h:
     14   
     15    Source/WTF:
     16   
     17    Add a new compile-time flag.
     18   
     19    * wtf/PlatformHave.h:
     20   
     21    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@285828 268f45cc-cd09-0410-ab3c-d52691b4dbfc
     22
     23    2021-11-15  Wenson Hsieh  <wenson_hsieh@apple.com>
     24
     25            Unreviewed, fix the internal iOS 15 build
     26
     27            In the internal iOS 15 SDK, <UIKit/NSTextList.h> does not define NSTextListMarkerFormat. Add a separate SDK
     28            version check instead and only attempt to soft-link these constants if we're compiling against an SDK that we
     29            know exports these symbols.
     30
     31            * pal/spi/cocoa/NSAttributedStringSPI.h:
     32
    1332021-11-15  Russell Epstein  <repstein@apple.com>
    234

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

    r285844 r285845  
    9797#define NSTextAlternativesAttributeName getNSTextAlternativesAttributeName()
    9898
    99 #if __has_include(<UIKit/NSTextList.h>)
     99#if HAVE(NSTEXTLIST_MARKER_FORMATS)
     100#if USE(APPLE_INTERNAL_SDK)
    100101#import <UIKit/NSTextList.h>
    101102#else
    102103typedef NSString *NSTextListMarkerFormat;
    103 #endif
     104#endif // USE(APPLE_INTERNAL_SDK)
    104105SOFT_LINK_CONSTANT(UIFoundation, NSTextListMarkerCircle, NSTextListMarkerFormat)
    105106#define NSTextListMarkerCircle getNSTextListMarkerCircle()
    … …  
    128129SOFT_LINK_CONSTANT(UIFoundation, NSTextListMarkerDecimal, NSTextListMarkerFormat)
    129130#define NSTextListMarkerDecimal getNSTextListMarkerDecimal()
     131#else
     132typedef NSString *NSTextListMarkerFormat;
     133static NSTextListMarkerFormat const NSTextListMarkerCircle = @"{circle}";
     134static NSTextListMarkerFormat const NSTextListMarkerDisc = @"{disc}";
     135static NSTextListMarkerFormat const NSTextListMarkerSquare = @"{square}";
     136static NSTextListMarkerFormat const NSTextListMarkerLowercaseHexadecimal = @"{lower-hexadecimal}";
     137static NSTextListMarkerFormat const NSTextListMarkerUppercaseHexadecimal = @"{upper-hexadecimal}";
     138static NSTextListMarkerFormat const NSTextListMarkerOctal = @"{octal}";
     139static NSTextListMarkerFormat const NSTextListMarkerLowercaseAlpha = @"{lower-alpha}";
     140static NSTextListMarkerFormat const NSTextListMarkerUppercaseAlpha = @"{upper-alpha}";
     141static NSTextListMarkerFormat const NSTextListMarkerLowercaseLatin = @"{lower-latin}";
     142static NSTextListMarkerFormat const NSTextListMarkerUppercaseLatin = @"{upper-latin}";
     143static NSTextListMarkerFormat const NSTextListMarkerLowercaseRoman = @"{lower-roman}";
     144static NSTextListMarkerFormat const NSTextListMarkerUppercaseRoman = @"{upper-roman}";
     145static NSTextListMarkerFormat const NSTextListMarkerDecimal = @"{decimal}";
     146#endif // HAVE(NSTEXTLIST_MARKER_FORMATS)
    130147
    131148// We don't softlink NSSuperscriptAttributeName because UIFoundation stopped exporting it.
Note: See TracChangeset for help on using the changeset viewer.