Summary: | Clean up some obsolete macOS version guards | ||||||||
---|---|---|---|---|---|---|---|---|---|
Product: | WebKit | Reporter: | Alexey Proskuryakov <ap> | ||||||
Component: | WebKit Misc. | Assignee: | Alexey Proskuryakov <ap> | ||||||
Status: | RESOLVED FIXED | ||||||||
Severity: | Normal | CC: | bfulgham, mitz, thorton, webkit-bug-importer | ||||||
Priority: | P2 | Keywords: | InRadar | ||||||
Version: | Other | ||||||||
Hardware: | Unspecified | ||||||||
OS: | Unspecified | ||||||||
Attachments: |
|
Description
Alexey Proskuryakov
2018-10-24 14:22:17 PDT
Created attachment 353055 [details]
proposed patch
This should be no-op, except for the change in Source/WebKit/PluginProcess/mac/com.apple.WebKit.plugin-common.sb.in.
In that file, we have some rules guarded with "__MAC_OS_X_VERSION_MIN_REQUIRED < 101240". MIN_REQUIRED doesn't change with SDK, so the code was actually still built on macOS Sierra even after 10.12.4 update. But looks like the intention was that it wouldn't be included, so I removed it.
WebKitAvailability.h is a public header. Are these changes source-compatible with projects targeting 10.10 and earlier? Comment on attachment 353055 [details]
proposed patch
Good catch. I'll undo this part if I can get r+ on the rest.
Created attachment 353061 [details]
proposed patch
Had to fix Windows build, so also addressed Dan's comment.
Comment on attachment 353061 [details] proposed patch View in context: https://bugs.webkit.org/attachment.cgi?id=353061&action=review r=me > Source/WebKit/PluginProcess/mac/com.apple.WebKit.plugin-common.sb.in:-333 > -#if __MAC_OS_X_VERSION_MIN_REQUIRED < 101240 It’s not clear if we’re gaining anything at this point from changing the code from “as shipped and tested” to “as intended”. For clarity and safety, we could just change this to < 101300. Looking at history of related issues, I agree. Committed http://trac.webkit.org/r237405 |