Bug 234540 – Upstream some HAVE/ENABLE/USE macros

• Status: RESOLVED
• Resolution: CONFIGURATION CHANGED
• Component: New Bugs

[Tim Horton]

Upstream some HAVE/ENABLE/USE macros

[Tim Horton]

Created attachment 447674 [details]
Patch

[Alexey Proskuryakov]

Comment on attachment 447674 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=447674&action=review

Seems like too many red EWSes to r_ as is.

> Source/WTF/wtf/PlatformEnableCocoa.h:554
> +    && ((PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 150000) \

__IPHONE_OS_VERSION_MIN_REQUIRED is always >= 150000

This is repeated many times in the patch, I'll only comment once.

> Source/WTF/wtf/PlatformEnableCocoa.h:589
> +    && (((PLATFORM(IOS) || PLATFORM(MACCATALYST)) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 150000) \

Does PLATFORM(MACCATALYST) get a __IPHONE_OS_VERSION_MIN_REQUIRED? One way or another, version check is not needed any more.

> Source/WTF/wtf/PlatformEnableCocoa.h:590
> +    || (PLATFORM(WATCHOS) && __WATCH_OS_VERSION_MIN_REQUIRED >= 80000) \

Well, and same for watchOS/tvOS.

> Source/WTF/wtf/PlatformHave.h:1119
> +#if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 130000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101500)

And for __MAC_OS_X_VERSION_MIN_REQUIRED >= 101500

[Tim Horton]

(In reply to Alexey Proskuryakov from comment #2)
> Comment on attachment 447674 [details]
> Patch
> 
> View in context:
> https://bugs.webkit.org/attachment.cgi?id=447674&action=review
> 
> Seems like too many red EWSes to r_ as is.

Agreed, will need some SPI header changes!

> > Source/WTF/wtf/PlatformEnableCocoa.h:554
> > +    && ((PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 150000) \
> 
> __IPHONE_OS_VERSION_MIN_REQUIRED is always >= 150000
> 
> This is repeated many times in the patch, I'll only comment once.

Good point! I wasn't resolving anything down, just upstreaming, but this is probably the best time to do it...

> > Source/WTF/wtf/PlatformEnableCocoa.h:589
> > +    && (((PLATFORM(IOS) || PLATFORM(MACCATALYST)) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 150000) \
> 
> Does PLATFORM(MACCATALYST) get a __IPHONE_OS_VERSION_MIN_REQUIRED? One way
> or another, version check is not needed any more.

It does (thankfully), but good point.

> > Source/WTF/wtf/PlatformHave.h:1119
> > +#if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 130000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101500)
> 
> And for __MAC_OS_X_VERSION_MIN_REQUIRED >= 101500

Nice!

[Radar WebKit Bug Importer]

<rdar://problem/86946926>

[Anne van Kesteren]

Looks like this got resolved elsewhere.