Bug 201967 – Remove some support for < iOS 13

• Status: RESOLVED
• Resolution: FIXED
• Component: WebKit Misc.

[Keith Rollin]

Remove some support for iOS versions less than 13.0. 

Update conditionals that reference __IPHONE_OS_VERSION_MIN_REQUIRED and __IPHONE_OS_VERSION_MAX_ALLOWED, assuming that they both have values >= 130000. This means that expressions like "__IPHONE_OS_VERSION_MIN_REQUIRED < 101300" are always False and "__IPHONE_OS_VERSION_MIN_REQUIRED >= 101300" are always True.

After version checks have been removed, there are some cases where the preprocessor conditional looks like "#if PLATFORM(MAC) || PLATFORM(IOS_FAMILY)". These can be collapsed into "#if PLATFORM(COCOA)". This additional cleanup will be performed in a subsequent patch.

This removal is part of a series of patches effecting the removal of dead code for old versions of iOS. This particular pass involves changes in which Andy Estes was involved. These changes are isolated from other similar changes in order to facilitate the reviewing process.

[Radar WebKit Bug Importer]

<rdar://problem/55504738>

[Keith Rollin]

> These can be collapsed into "#if PLATFORM(COCOA)". 

Actually, in somme cases, even this check can be removed if in a Cocoa-only file.

[Keith Rollin]

Created attachment 379190 [details]
Patch

[Andy Estes]

Comment on attachment 379190 [details]
Patch

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

> Source/WebCore/platform/cocoa/NetworkExtensionContentFilter.mm:78
> -#if PLATFORM(MAC) || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000)
> +#if PLATFORM(MAC) || PLATFORM(IOS_FAMILY)

I think this is equivalent to PLATFORM(COCOA), in which case it can be removed.

[Andy Estes]

(In reply to Andy Estes from comment #4)
> Comment on attachment 379190 [details]
> Patch
> 
> View in context:
> https://bugs.webkit.org/attachment.cgi?id=379190&action=review
> 
> > Source/WebCore/platform/cocoa/NetworkExtensionContentFilter.mm:78
> > -#if PLATFORM(MAC) || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000)
> > +#if PLATFORM(MAC) || PLATFORM(IOS_FAMILY)
> 
> I think this is equivalent to PLATFORM(COCOA), in which case it can be
> removed.

Oh, you said you'd squash up in a subsequent patch (but I still think you can remove in this case :))

[Keith Rollin]

Yeah, I know it's simple to squash these things into PLATFORM(COCOA) or remove them altogether in Cocoa-only files. But I have a lot of patches in this series with lots of details to keep track of, and I really don't want to stray from the process I have set up to make sure I don't drop anything or distract me from the steps I'm on now.

[WebKit Commit Bot]

Comment on attachment 379190 [details]
Patch

Clearing flags on attachment: 379190

Committed r250160: <https://trac.webkit.org/changeset/250160>

[WebKit Commit Bot]

All reviewed patches have been landed.  Closing bug.

[Darin Adler]

Comment on attachment 379190 [details]
Patch

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

> Source/WTF/ChangeLog:21
> +        After version checks have been removed, there are some cases where the
> +        preprocessor conditional looks like "#if PLATFORM(MAC) ||
> +        PLATFORM(IOS_FAMILY)". These can be collapsed into "#if
> +        PLATFORM(COCOA)". This additional cleanup will be performed in a
> +        subsequent patch.

Depending on which source file they are in, they can be removed entirely rather than collapsed into "#if PLATFORM(COCOA)". Our Objective-C and Objective-C++ source files don’t compile on non-Cocoa platforms, so we don’t need conditionals in them.

[Darin Adler]

Oh, I see your comment saying that above, Keith.