Skip to content

Commit 2726e5d

Browse files
aproskuryakovaproskuryakov
committed
Remove runtime support for older Apple OS versions
https://bugs.webkit.org/show_bug.cgi?id=312750 rdar://175142108 Reviewed by Richard Robinson. Remove code for macOS older than 15.7 and embedded OSes older than 26.2, deployment target edition. * Configurations/DeploymentTargets.xcconfig: * Configurations/Makefile: * Configurations/SDKAdditions.xcconfig: * Configurations/Version.xcconfig: * Configurations/WebKitProjectPaths.xcconfig: * Configurations/WebKitTargetConditionals.xcconfig: * Source/JavaScriptCore/Configurations/Base.xcconfig: * Source/JavaScriptCore/Scripts/process-entitlements.sh: * Source/WTF/wtf/PlatformEnable.h: * Source/WTF/wtf/PlatformEnableCocoa.h: * Source/WTF/wtf/PlatformHave.h: * Source/WTF/wtf/PlatformUse.h: * Source/WebCore/Configurations/WebCore.xcconfig: * Source/WebCore/Modules/ShapeDetection/Implementation/Cocoa/VisionUtilities.mm: (WebCore::ShapeDetection::configureRequestToUseCPUOrGPU): * Source/WebCore/PAL/Configurations/PAL.xcconfig: * Source/WebCore/PAL/pal/cocoa/CoreTelephonySoftLink.h: * Source/WebCore/PAL/pal/cocoa/CoreTelephonySoftLink.mm: * Source/WebCore/platform/graphics/cocoa/UnrealizedCoreTextFont.cpp: (WebCore::UnrealizedCoreTextFont::addAttributesForOpticalSizing): (WebCore::UnrealizedCoreTextFont::modifyFromContext): (WebCore::UnrealizedCoreTextFont::realize const): (WebCore::UnrealizedCoreTextFont::rebuildReason const): Deleted. * Source/WebCore/platform/graphics/cocoa/UnrealizedCoreTextFont.h: (WebCore::UnrealizedCoreTextFont::RebuildReason::hasEffect const): Deleted. * Source/WebCore/platform/network/cf/ResourceError.h: * Source/WebCore/platform/network/cocoa/ResourceErrorCocoa.mm: (WebCore::createNSErrorFromResourceErrorBase): (WebCore::ResourceError::hasMatchingFailingURLKeys const): Deleted. * Source/WebGPU/WebGPU/BindGroupLayout.h: * Source/WebKit/Configurations/GPUExtension.xcconfig: * Source/WebKit/Configurations/NetworkingExtension.xcconfig: * Source/WebKit/Configurations/WebContentExtension.xcconfig: * Source/WebKit/Configurations/WebContentService.xcconfig: * Source/WebKit/Configurations/WebKit.xcconfig: * Source/WebKit/NetworkProcess/Authentication/cocoa/AuthenticationManagerCocoa.mm: (WebKit::AuthenticationManager::initializeConnection): * Source/WebKit/Platform/cocoa/XPCUtilities.h: * Source/WebKit/Platform/cocoa/XPCUtilities.mm: (WebKit::terminateWithReason): (WebKit::handleXPCExitMessage): Deleted. * Source/WebKit/Scripts/process-entitlements.sh: * Source/WebKit/Scripts/update-info-plist-for-runningboard.sh: * Source/WebKit/Shared/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.mm: (WebKit::toPKShippingContactEditingMode): * Source/WebKit/Shared/Cocoa/CoreIPCError.h: (WebKit::CoreIPCError::CoreIPCError): * Source/WebKit/Shared/Cocoa/CoreIPCError.mm: (WebKit::CoreIPCError::toID const): (WebKit::CoreIPCError::CoreIPCError): * Source/WebKit/Shared/Cocoa/CoreIPCError.serialization.in: * Source/WebKit/Shared/Cocoa/WebErrorsCocoa.mm: (WebKit::createNSError): * Source/WebKit/Shared/Cocoa/XPCEndpoint.mm: (WebKit::XPCEndpoint::XPCEndpoint): * Source/WebKit/Shared/EntryPointUtilities/Cocoa/XPCService/XPCServiceMain.mm: (WebKit::XPCServiceEventHandler): * Source/WebKit/UIProcess/Cocoa/CoreTelephonyUtilities.mm: (WebKit::shouldAllowAutoFillForCellularIdentifiers): * Source/WebKit/UIProcess/WebPageProxy.cpp: (WebKit::WebPageProxy::didFailProvisionalLoadForFrameShared): * Tools/TestWebKitAPI/Configurations/TestWebKitAPIBase.xcconfig: * Tools/TestWebKitAPI/Tests/WebCore/cocoa/CaptionPreferencesTests.mm: (TestWebKitAPI::TEST_F(CaptionPreferenceTests, Colors)): * Tools/TestWebKitAPI/Tests/WebKit/WKWebView/AppleVisualEffectTests.mm: * Tools/TestWebKitAPI/Tests/WebKit/WKWebView/CSSViewportUnits.mm: * Tools/TestWebKitAPI/Tests/WebKit/WKWebView/ContextMenus.mm: * Tools/TestWebKitAPI/Tests/WebKit/WKWebView/DocumentEditingContext.mm: * Tools/TestWebKitAPI/Tests/WebKit/WKWebView/ExitPiPOnSuspendVideoElement.mm: * Tools/TestWebKitAPI/Tests/WebKit/WKWebView/FullscreenDelegate.mm: * Tools/TestWebKitAPI/Tests/WebKit/WKWebView/FullscreenLifecycle.mm: * Tools/TestWebKitAPI/Tests/WebKit/WKWebView/LockdownModeFonts.mm: * Tools/TestWebKitAPI/Tests/WebKit/WKWebView/MediaBufferingPolicy.mm: (TEST(WebKit, MediaBufferingPolicy)): (TEST(WebKit, MediaBufferingPolicyWhenSuspendedOrHidden)): * Tools/TestWebKitAPI/Tests/WebKit/WKWebView/MediaSession.mm: (TestWebKitAPI::TEST_F(MediaSessionTest, DISABLED_OnlyOneHandler)): (TestWebKitAPI::TEST_F(MediaSessionTest, DISABLED_RemoteCommands)): * Tools/TestWebKitAPI/Tests/WebKit/WKWebView/NoPauseWhenSwitchingTabs.mm: * Tools/TestWebKitAPI/Tests/WebKit/WKWebView/PreferredAudioBufferSize.mm: * Tools/TestWebKitAPI/Tests/WebKit/WKWebView/ProcessSuspendMediaBuffering.mm: * Tools/TestWebKitAPI/Tests/WebKit/WKWebView/ProcessSwapOnNavigation.mm: ((ProcessSwap, QuickLookRequestsPasswordAfterSwap)): * Tools/TestWebKitAPI/Tests/WebKit/WKWebView/Proxy.mm: (TestWebKitAPI::TEST(WebKit, SOCKS5API)): (TestWebKitAPI::TEST(WebKit, DISABLED_ProxyConfigurationAuthentication)): (TestWebKitAPI::TEST(WebKit, RelaxThirdPartyCookieBlocking)): * Tools/TestWebKitAPI/Tests/WebKit/WKWebView/ResourceLoadStatistics.mm: * Tools/TestWebKitAPI/Tests/WebKit/WKWebView/SafeBrowsing.mm: (TEST(SafeBrowsing, WKWebViewGoBackIFrame)): (TEST(SafeBrowsing, PostResponseIframe)): (TEST(SafeBrowsing, PhishingInFrame)): * Tools/TestWebKitAPI/Tests/WebKit/WKWebView/ServiceWorkerBasic.mm: ((ServiceWorkers, SWProcessConnectionCreation)): * Tools/TestWebKitAPI/Tests/WebKit/WKWebView/ShrinkToFit.mm: * Tools/TestWebKitAPI/Tests/WebKit/WKWebView/UIDelegate.mm: * Tools/TestWebKitAPI/Tests/WebKit/WKWebView/VideoControlsManager.mm: * Tools/TestWebKitAPI/Tests/WebKit/WKWebView/WKURLSchemeHandler-1.mm: * Tools/TestWebKitAPI/Tests/WebKit/WKWebView/WKWebViewCloseAllMediaPresentations.mm: * Tools/TestWebKitAPI/Tests/WebKit/WKWebView/WKWebViewDoesNotLogDuringInitialization.mm: (TEST(WKWebView, DISABLED_InitializingWebViewWithEphemeralStorageDoesNotLog)): (TEST(WKWebView, InitializingWebViewWithEphemeralStorageDoesNotLog)): Deleted. * Tools/TestWebKitAPI/Tests/WebKit/WKWebView/WKWebViewSuspendAllMediaPlayback.mm: * Tools/TestWebKitAPI/Tests/WebKit/WKWebView/WebSocket.mm: * Tools/TestWebKitAPI/Tests/WebKit/WKWebView/_WKWebAuthenticationPanel.mm: * Tools/TestWebKitAPI/Tests/WebKit/WKWebView/ios/KeyboardInputTestsIOS.mm: (TestWebKitAPI::TEST(KeyboardInputTests, DeviceEIDAndIMEIAutoFill)): * Tools/TestWebKitAPI/Tests/WebKit/WKWebView/mac/CrossPartitionFileSchemeAccess.mm: (TestWebKitAPI::TEST(WebKitLegacy, CrossPartitionFileSchemeAccess)): * Tools/TestWebKitAPI/Tests/WebKit/WKWebView/mac/FullscreenFocus.mm: * Tools/TestWebKitAPI/Tests/WebKit/WKWebView/mac/WKWebViewMacEditingTests.mm: (TestWebKitAPI::TEST(WKWebViewMacEditingTests, SetMarkedTextWithNoAttributedString)): * Tools/TestWebKitAPI/config.h: Canonical link: https://commits.webkit.org/311606@main
1 parent a3545b2 commit 2726e5d

75 files changed

Lines changed: 376 additions & 1567 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Configurations/DeploymentTargets.xcconfig‎

Lines changed: 0 additions & 255 deletions
Large diffs are not rendered by default.

‎Configurations/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# on. Update this list when new major versions are released, to support
44
# building downlevels targeting those OS versions. Remove from this list when
55
# WebKit drops downlevel support for an OS version.
6-
SUPPORTED_MAC_OS_VERSIONS = 14 15 26
6+
SUPPORTED_MAC_OS_VERSIONS = 15 26
77

88
DeploymentTargets.xcconfig: Scripts/generate-deployment-target-xcconfig.py Makefile
99
./$< $(SUPPORTED_MAC_OS_VERSIONS) > $@

‎Configurations/SDKAdditions.xcconfig‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,6 @@
2727
//WK_HAS_UNVERSIONED_SDK_ADDITIONS = ;
2828

2929
WK_HAS_VERSIONED_SDK_ADDITIONS = $(WK_NOT_$(USE_INTERNAL_SDK));
30-
// Prior to Sonoma, downlevel macOS and STP builds link against AppleJPEGXL.framework.
31-
WK_HAS_VERSIONED_SDK_ADDITIONS[sdk=macos*] = $(WK_HAS_VERSIONED_SDK_ADDITIONS$(WK_MACOS_1400));
32-
WK_HAS_VERSIONED_SDK_ADDITIONS_MACOS_BEFORE_1400 = YES;
33-
WK_HAS_VERSIONED_SDK_ADDITIONS_MACOS_SINCE_1400 = $(WK_NOT_$(USE_INTERNAL_SDK));
3430

3531
WK_ADDITIONAL_SDKS = $(WK_ADDITIONAL_SDKS_UNVERSIONED_$(WK_HAS_UNVERSIONED_SDK_ADDITIONS)_VERSIONED_$(WK_HAS_VERSIONED_SDK_ADDITIONS));
3632
WK_ADDITIONAL_SDKS_UNVERSIONED__VERSIONED_ = ;

‎Configurations/Version.xcconfig‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,6 @@ BUNDLE_VERSION = $(BUNDLE_VERSION_$(CONFIGURATION));
3333
SHORT_VERSION_STRING = $(SHORT_VERSION_STRING_$(CONFIGURATION))
3434

3535
SYSTEM_VERSION_MAJOR_SHORT_MACOS = $(SYSTEM_VERSION_MAJOR_SHORT_MACOS_$(TARGET_MAC_OS_X_VERSION_MAJOR))
36-
SYSTEM_VERSION_MAJOR_SHORT_MACOS_110000 = 11
37-
SYSTEM_VERSION_MAJOR_SHORT_MACOS_120000 = 12
38-
SYSTEM_VERSION_MAJOR_SHORT_MACOS_130000 = 13
39-
SYSTEM_VERSION_MAJOR_SHORT_MACOS_140000 = 14
4036
SYSTEM_VERSION_MAJOR_SHORT_MACOS_150000 = 15
4137
SYSTEM_VERSION_MAJOR_SHORT_MACOS_160000 = 16
4238
SYSTEM_VERSION_MAJOR_SHORT_MACOS_270000 = 27
@@ -46,10 +42,6 @@ SYSTEM_VERSION_MAJOR_SHORT_MACOS_300000 = 30
4642

4743
// The system version prefix is based on the current system version.
4844
SYSTEM_VERSION_PREFIX = $(SYSTEM_VERSION_PREFIX_$(PLATFORM_NAME)_$(SYSTEM_VERSION_MAJOR_SHORT_MACOS))
49-
SYSTEM_VERSION_PREFIX_macosx_11 = 16
50-
SYSTEM_VERSION_PREFIX_macosx_12 = 17
51-
SYSTEM_VERSION_PREFIX_macosx_13 = 18
52-
SYSTEM_VERSION_PREFIX_macosx_14 = 19
5345
SYSTEM_VERSION_PREFIX_macosx_15 = 20
5446
SYSTEM_VERSION_PREFIX_macosx_16 = 21
5547
SYSTEM_VERSION_PREFIX_macosx_27 = 22

‎Configurations/WebKitProjectPaths.xcconfig‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,9 +91,6 @@ WK_WORKSPACE_DIR_4_Source = $(SRCROOT)/../../../../..;
9191
WK_WORKSPACE_DIR_5_Source = $(SRCROOT)/../../../../../..;
9292
WK_WORKSPACE_DIR_6_Source = $(SRCROOT)/../../../../../../..;
9393

94-
WK_DOWNLEVEL_FRAMEWORK_STUBS_DIR[sdk=macos*] = $(WK_DOWNLEVEL_FRAMEWORK_STUBS_DIR$(WK_MACOS_1400);
95-
WK_DOWNLEVEL_FRAMEWORK_STUBS_DIR_MACOS_BEFORE_1400 = $(WK_WORKSPACE_DIR)/WebKitLibraries/DownlevelFrameworkStubs/$(TARGET_MAC_OS_X_VERSION_MAJOR);
96-
9794
WK_VERSIONED_SDK_ADDITIONS_PATH = $(WK_VERSIONED_SDK_ADDITIONS_PATH_$(USE_INTERNAL_SDK));
9895
WK_VERSIONED_SDK_ADDITIONS_PATH_ = $(WK_WORKSPACE_DIR)/WebKitLibraries/SDKs/$(PLATFORM_NAME)$(SDK_VERSION:base).0-additions.sdk;
9996
WK_VERSIONED_SDK_ADDITIONS_PATH_YES = $(WK_WORKSPACE_DIR)/WebKitLibraries/SDKs/$(PLATFORM_NAME)$(SDK_VERSION:base).0.internal-additions.sdk;

0 commit comments

Comments
 (0)