Branch: refs/heads/main
Home: https://github.com/WebKit/WebKit
Commit: f1234a3b17536c6d179e0e84b38ca28ec800c03d
https://github.com/WebKit/WebKit/commit/f1234a3b17536c6d179e0e84b38ca28ec800c03d
Author: Pascoe <[email protected]>
Date: 2026-05-21 (Thu, 21 May 2026)
Changed paths:
M CMakeLists.txt
M Source/JavaScriptCore/CMakeLists.txt
M Source/JavaScriptCore/PlatformCocoa.cmake
M Source/JavaScriptCore/PlatformIOS.cmake
M Source/ThirdParty/libwebrtc/CMakeLists.txt
M Source/WTF/wtf/PlatformIOS.cmake
M Source/WTF/wtf/PlatformMac.cmake
M Source/WebCore/CMakeLists.txt
M Source/WebCore/Info.plist
M Source/WebCore/PAL/pal/CMakeLists.txt
A Source/WebCore/PlatformCocoa.cmake
A Source/WebCore/PlatformIOS.cmake
M Source/WebCore/PlatformMac.cmake
M Source/WebCore/WebCoreAVFoundationPrefix.h
M Source/WebCore/editing/cocoa/HTMLConverter.h
M Source/WebCore/platform/LocalizedStrings.h
M Source/WebCore/platform/SerializedPlatformDataCueValue.h
M Source/WebCore/platform/audio/ios/MediaSessionManagerIOS.mm
M Source/WebCore/platform/audio/ios/SpatialAudioPlaybackHelperIOS.mm
M Source/WebCore/platform/cocoa/SystemBattery.mm
M
Source/WebCore/platform/graphics/ca/cocoa/GraphicsLayerAsyncContentsDisplayDelegateCocoa.h
M Source/WebCore/platform/graphics/cocoa/WebMAudioUtilitiesCocoa.h
M Source/WebCore/platform/network/cocoa/RangeResponseGenerator.h
M Source/WebCore/platform/video-codecs/cocoa/WebRTCVideoDecoderVTBAV1.h
M Source/WebCore/platform/video-codecs/cocoa/WebRTCVideoDecoderVTBAV1.mm
M Source/WebCore/platform/video-codecs/cocoa/WebRTCVideoDecoderVTBVP9.h
M Source/WebCore/platform/video-codecs/cocoa/WebRTCVideoDecoderVTBVP9.mm
R Source/WebCore/rendering/style/StyleTextEdge.cpp
R Source/WebCore/rendering/style/StyleTextEdge.h
M Source/WebCore/testing/MockContentFilterManager.cpp
M Source/WebCore/testing/MockContentFilterManager.h
M Source/WebGPU/WGSL/CMakeLists.txt
M Source/WebGPU/WebGPU/CMakeLists.txt
M Source/WebKit/CMakeLists.txt
M Source/WebKit/PlatformIOS.cmake
M Source/WebKitLegacy/PlatformIOS.cmake
M Source/WebKitLegacy/WebKitLegacy-iOS.exp
A Source/cmake/MigrateHeaders.cmake
M Source/cmake/OptionsCocoa.cmake
M Source/cmake/OptionsIOS.cmake
M Source/cmake/OptionsMac.cmake
A Source/cmake/SymlinkHeaders.cmake
M Source/cmake/WebKitCommon.cmake
M Source/cmake/WebKitHeaderMap.cmake
M Source/cmake/WebKitMacros.cmake
M Tools/Scripts/generate-header-map
M Tools/Scripts/swift/swiftc-wrapper.sh
M Tools/TestWebKitAPI/PlatformMac.cmake
M Tools/WebKitTestRunner/CMakeLists.txt
Log Message:
-----------
Reland [CMake] Fix iOS CMake build for WebCore
https://bugs.webkit.org/show_bug.cgi?id=312915
<rdar://problem/175263611>
Unreviewed, reland after causing issues for the cmake build under some SDK,
originally reviewed by BJ Burg.
Add PlatformIOS.cmake with comprehensive iOS build configuration. The new
file sets up the WebCore.framework structure with PrivateHeaders and Modules
directories, configures iOS-specific compile options and warnings, and links
required system frameworks including AudioToolbox, CoreMedia, Metal, UIKit,
and VideoToolbox.
Condition libwebrtc audio device implementations on the platform type. On
macOS (Darwin), compile create_audio_device_module.cc, audio_device_impl.cc,
and the platform-specific audio_device_mac.cc implementation. On iOS, define
WEBRTC_IOS to enable iOS-specific audio paths while excluding the Mac audio
device. This ensures proper audio device module instantiation across platforms.
Fix WebCore framework header inclusion by adding missing include guards and
forward declarations to cocoa and iOS headers. Add DumpRenderTree as an
allowable framework client in WebCore's linker options. Update WebGPU module
CMakeLists.txt to properly configure for iOS target requirements.
* CMakeLists.txt:
* Source/JavaScriptCore/CMakeLists.txt:
* Source/JavaScriptCore/PlatformCocoa.cmake:
* Source/JavaScriptCore/PlatformIOS.cmake:
* Source/ThirdParty/libwebrtc/CMakeLists.txt:
* Source/WTF/wtf/PlatformIOS.cmake:
* Source/WTF/wtf/PlatformMac.cmake:
* Source/WebCore/CMakeLists.txt:
* Source/WebCore/Info.plist:
* Source/WebCore/PAL/pal/CMakeLists.txt:
* Source/WebCore/PlatformCocoa.cmake: Copied from
Source/WebCore/PlatformMac.cmake.
* Source/WebCore/PlatformIOS.cmake: Added.
* Source/WebCore/PlatformMac.cmake:
* Source/WebCore/WebCoreAVFoundationPrefix.h:
* Source/WebCore/editing/cocoa/HTMLConverter.h:
* Source/WebCore/platform/LocalizedStrings.h:
* Source/WebCore/platform/SerializedPlatformDataCueValue.h:
* Source/WebCore/platform/audio/ios/MediaSessionManagerIOS.mm:
* Source/WebCore/platform/audio/ios/SpatialAudioPlaybackHelperIOS.mm:
* Source/WebCore/platform/cocoa/SystemBattery.mm:
*
Source/WebCore/platform/graphics/ca/cocoa/GraphicsLayerAsyncContentsDisplayDelegateCocoa.h:
* Source/WebCore/platform/graphics/cocoa/WebMAudioUtilitiesCocoa.h:
* Source/WebCore/platform/network/cocoa/RangeResponseGenerator.h:
* Source/WebCore/platform/video-codecs/cocoa/WebRTCVideoDecoderVTBAV1.h:
* Source/WebCore/platform/video-codecs/cocoa/WebRTCVideoDecoderVTBAV1.mm:
* Source/WebCore/platform/video-codecs/cocoa/WebRTCVideoDecoderVTBVP9.h:
* Source/WebCore/platform/video-codecs/cocoa/WebRTCVideoDecoderVTBVP9.mm:
* Source/WebCore/rendering/style/StyleTextEdge.cpp: Removed.
* Source/WebCore/rendering/style/StyleTextEdge.h: Removed.
* Source/WebCore/testing/MockContentFilterManager.cpp:
* Source/WebCore/testing/MockContentFilterManager.h:
* Source/WebGPU/WGSL/CMakeLists.txt:
* Source/WebGPU/WebGPU/CMakeLists.txt:
* Source/WebKit/CMakeLists.txt:
* Source/WebKit/Modules/iOS_Private.modulemap:
* Source/WebKit/PlatformIOS.cmake:
* Source/WebKitLegacy/PlatformIOS.cmake:
* Source/WebKitLegacy/WebKitLegacy-iOS.exp:
* Source/cmake/MigrateHeaders.cmake: Added.
* Source/cmake/OptionsCocoa.cmake:
* Source/cmake/OptionsIOS.cmake:
* Source/cmake/OptionsMac.cmake:
* Source/cmake/SymlinkHeaders.cmake: Added.
* Source/cmake/WebKitCommon.cmake:
* Source/cmake/WebKitHeaderMap.cmake:
* Source/cmake/WebKitMacros.cmake:
* Tools/Scripts/generate-header-map:
(collect_mappings):
(main):
* Tools/Scripts/swift/swiftc-wrapper.sh:
* Tools/TestWebKitAPI/PlatformMac.cmake:
* Tools/WebKitTestRunner/CMakeLists.txt:
Canonical link: https://commits.webkit.org/313700@main
To unsubscribe from these emails, change your notification settings at
https://github.com/WebKit/WebKit/settings/notifications
