Bug 211402 - Make __IPHONE_OS_VERSION_MIN_REQUIRED checks against old versions explicit about watchOS and tvOS
Summary: Make __IPHONE_OS_VERSION_MIN_REQUIRED checks against old versions explicit ab...
Status: RESOLVED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: New Bugs (show other bugs)
Version: WebKit Nightly Build
Hardware: Unspecified Unspecified
: P2 Normal
Assignee: Darin Adler
URL:
Keywords: InRadar
Depends on:
Blocks:
 
Reported: 2020-05-04 14:44 PDT by Darin Adler
Modified: 2020-05-04 18:54 PDT (History)
5 users (show)

See Also:

Attachments
Patch (43.63 KB, patch)
2020-05-04 17:56 PDT, Darin Adler 		ap: review+
Details | Formatted Diff | Diff
View All Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Darin Adler 2020-05-04 14:44:28 PDT 
Make __IPHONE_OS_VERSION_MIN_REQUIRED checks against old versions explicit about watchOS and tvOS
Comment 1 Darin Adler 2020-05-04 17:56:23 PDT 
Created attachment 398447 [details]
Patch
Comment 2 Alexey Proskuryakov 2020-05-04 18:17:46 PDT 
Comment on attachment 398447 [details]
Patch

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

> Source/WebKit/ChangeLog:12
> +        * Platform/spi/ios/UIKitSPI.h: Move from __IPHONE_OS_VERSION_MIN_REQUIRED to
> +        PLATFORM(IOS) in one place, and in the other removed the conditional entirely.

I went back here to find out why there isn't a comment about watchOS and tvOS in the code.

> Source/WebCore/page/SettingsDefaultValues.h:109
> +#if PLATFORM(COCOA) && !(PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101400) && !PLATFORM(APPLETV)

There is no __MAC_OS_X_VERSION_MIN_REQUIRED < 101400.

> Source/WebCore/platform/graphics/cg/GradientCG.cpp:187
> +#if PLATFORM(COCOA) && !(PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101400) && !PLATFORM(APPLETV)

Ditto.

> Source/WebKit/NetworkProcess/NetworkActivityTracker.h:31
> +#if USE(APPLE_INTERNAL_SDK) && PLATFORM(COCOA) && !(PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101400) && !PLATFORM(APPLETV)

There is no __MAC_OS_X_VERSION_MIN_REQUIRED < 101400.

> Source/WebKit/Shared/WebPreferencesDefaultValues.h:225
> +#if PLATFORM(COCOA) && !(PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101400) && !PLATFORM(APPLETV)

There is no __MAC_OS_X_VERSION_MIN_REQUIRED < 101400.

> Tools/TestWebKitAPI/Tests/WebKitCocoa/WKHTTPCookieStore.mm:352
> +#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400) || PLATFORM(IOS)

It's always __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400
Comment 3 Darin Adler 2020-05-04 18:49:23 PDT 
Comment on attachment 398447 [details]
Patch

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

>> Source/WebKit/ChangeLog:12
>> +        PLATFORM(IOS) in one place, and in the other removed the conditional entirely.
> 
> I went back here to find out why there isn't a comment about watchOS and tvOS in the code.

Added a comment about that to the change log.

>> Source/WebCore/page/SettingsDefaultValues.h:109
>> +#if PLATFORM(COCOA) && !(PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101400) && !PLATFORM(APPLETV)
> 
> There is no __MAC_OS_X_VERSION_MIN_REQUIRED < 101400.

I’ll take care of all of these.
Comment 4 Darin Adler 2020-05-04 18:53:50 PDT 
Committed r261138: <https://trac.webkit.org/changeset/261138>
Comment 5 Radar WebKit Bug Importer 2020-05-04 18:54:15 PDT 
<rdar://problem/62871298>