Diff
Modified: trunk/ChangeLog (284297 => 284298)
--- trunk/ChangeLog 2021-10-16 00:44:00 UTC (rev 284297)
+++ trunk/ChangeLog 2021-10-16 00:44:06 UTC (rev 284298)
@@ -1,3 +1,13 @@
+2021-10-15 Ross Kirsling <ross.kirsl...@sony.com>
+
+ Realize Mac CMake build of WebCore and WebKit
+ https://bugs.webkit.org/show_bug.cgi?id=231749
+
+ Reviewed by Alex Christensen.
+
+ * Source/cmake/OptionsMac.cmake:
+ * Source/cmake/WebKitMacros.cmake:
+
2021-10-15 Jonathan Bedard <jbed...@apple.com>
Add github username for Dewei Zhu
Modified: trunk/Source/_javascript_Core/ChangeLog (284297 => 284298)
--- trunk/Source/_javascript_Core/ChangeLog 2021-10-16 00:44:00 UTC (rev 284297)
+++ trunk/Source/_javascript_Core/ChangeLog 2021-10-16 00:44:06 UTC (rev 284298)
@@ -1,3 +1,13 @@
+2021-10-15 Ross Kirsling <ross.kirsl...@sony.com>
+
+ Realize Mac CMake build of WebCore and WebKit
+ https://bugs.webkit.org/show_bug.cgi?id=231749
+
+ Reviewed by Alex Christensen.
+
+ * PlatformMac.cmake:
+ * shell/PlatformMac.cmake:
+
2021-10-15 Yusuke Suzuki <ysuz...@apple.com>
[JSC] Optimize Structure::getConcurrently
Modified: trunk/Source/_javascript_Core/PlatformMac.cmake (284297 => 284298)
--- trunk/Source/_javascript_Core/PlatformMac.cmake 2021-10-16 00:44:00 UTC (rev 284297)
+++ trunk/Source/_javascript_Core/PlatformMac.cmake 2021-10-16 00:44:06 UTC (rev 284298)
@@ -37,8 +37,6 @@
inspector/remote/cocoa/RemoteInspectorXPCConnection.h
)
-set(CMAKE_SHARED_LINKER_FLAGS ${CMAKE_SHARED_LINKER_FLAGS} "-compatibility_version 1 -current_version ${WEBKIT_MAC_VERSION} -force_load ${CMAKE_BINARY_DIR}/lib/libWTF.a -force_load ${CMAKE_BINARY_DIR}/lib/libbmalloc.a")
-
# FIXME: Make including these files consistent in the source so these forwarding headers are not needed.
if (NOT EXISTS ${_javascript_Core_DERIVED_SOURCES_DIR}/AugmentableInspectorControllerClient.h)
file(WRITE ${_javascript_Core_DERIVED_SOURCES_DIR}/AugmentableInspectorControllerClient.h "#include \"inspector/augmentable/AugmentableInspectorControllerClient.h\"")
Modified: trunk/Source/_javascript_Core/shell/PlatformMac.cmake (284297 => 284298)
--- trunk/Source/_javascript_Core/shell/PlatformMac.cmake 2021-10-16 00:44:00 UTC (rev 284297)
+++ trunk/Source/_javascript_Core/shell/PlatformMac.cmake 2021-10-16 00:44:06 UTC (rev 284298)
@@ -7,5 +7,4 @@
../API/tests/testapi.mm
)
list(APPEND testapi_SOURCES ${testapi_OBJC_SOURCES})
-list(APPEND jsc_LIBRARIES WTF)
set_source_files_properties(${testapi_OBJC_SOURCES} PROPERTIES COMPILE_FLAGS -fobjc-arc)
Modified: trunk/Source/ThirdParty/ANGLE/ChangeLog (284297 => 284298)
--- trunk/Source/ThirdParty/ANGLE/ChangeLog 2021-10-16 00:44:00 UTC (rev 284297)
+++ trunk/Source/ThirdParty/ANGLE/ChangeLog 2021-10-16 00:44:06 UTC (rev 284298)
@@ -1,3 +1,12 @@
+2021-10-15 Ross Kirsling <ross.kirsl...@sony.com>
+
+ Realize Mac CMake build of WebCore and WebKit
+ https://bugs.webkit.org/show_bug.cgi?id=231749
+
+ Reviewed by Alex Christensen.
+
+ * Compiler.cmake:
+
2021-10-15 Kyle Piddington <kpidding...@apple.com>
REGRESSION (r283667): webgl/2.0.0/deqp/functional/gles3/lifetime.html fails
Modified: trunk/Source/ThirdParty/ANGLE/Compiler.cmake (284297 => 284298)
--- trunk/Source/ThirdParty/ANGLE/Compiler.cmake 2021-10-16 00:44:00 UTC (rev 284297)
+++ trunk/Source/ThirdParty/ANGLE/Compiler.cmake 2021-10-16 00:44:06 UTC (rev 284298)
@@ -385,8 +385,6 @@
"src/compiler/translator/TranslatorMetalDirect/Reference.h"
"src/compiler/translator/TranslatorMetalDirect/RewriteCaseDeclarations.cpp"
"src/compiler/translator/TranslatorMetalDirect/RewriteCaseDeclarations.h"
- "src/compiler/translator/TranslatorMetalDirect/RewriteKeywords.cpp"
- "src/compiler/translator/TranslatorMetalDirect/RewriteKeywords.h"
"src/compiler/translator/TranslatorMetalDirect/RewriteOutArgs.cpp"
"src/compiler/translator/TranslatorMetalDirect/RewriteOutArgs.h"
"src/compiler/translator/TranslatorMetalDirect/RewritePipelines.cpp"
Modified: trunk/Source/WTF/ChangeLog (284297 => 284298)
--- trunk/Source/WTF/ChangeLog 2021-10-16 00:44:00 UTC (rev 284297)
+++ trunk/Source/WTF/ChangeLog 2021-10-16 00:44:06 UTC (rev 284298)
@@ -1,3 +1,12 @@
+2021-10-15 Ross Kirsling <ross.kirsl...@sony.com>
+
+ Realize Mac CMake build of WebCore and WebKit
+ https://bugs.webkit.org/show_bug.cgi?id=231749
+
+ Reviewed by Alex Christensen.
+
+ * wtf/PlatformMac.cmake:
+
2021-10-15 Sihui Liu <sihui_...@apple.com>
Enable Storage API by default
Modified: trunk/Source/WTF/wtf/PlatformMac.cmake (284297 => 284298)
--- trunk/Source/WTF/wtf/PlatformMac.cmake 2021-10-16 00:44:00 UTC (rev 284297)
+++ trunk/Source/WTF/wtf/PlatformMac.cmake 2021-10-16 00:44:06 UTC (rev 284298)
@@ -1,10 +1,12 @@
find_library(COCOA_LIBRARY Cocoa)
find_library(COREFOUNDATION_LIBRARY CoreFoundation)
find_library(READLINE_LIBRARY Readline)
+find_library(SECURITY_LIBRARY Security)
list(APPEND WTF_LIBRARIES
${COREFOUNDATION_LIBRARY}
${COCOA_LIBRARY}
${READLINE_LIBRARY}
+ ${SECURITY_LIBRARY}
)
list(APPEND WTF_PUBLIC_HEADERS
@@ -20,6 +22,7 @@
cocoa/RuntimeApplicationChecksCocoa.h
cocoa/SoftLinking.h
cocoa/SpanCocoa.h
+ cocoa/TollFreeBridging.h
cocoa/TypeCastsCocoa.h
cocoa/VectorCocoa.h
Modified: trunk/Source/WebCore/CMakeLists.txt (284297 => 284298)
--- trunk/Source/WebCore/CMakeLists.txt 2021-10-16 00:44:00 UTC (rev 284297)
+++ trunk/Source/WebCore/CMakeLists.txt 2021-10-16 00:44:06 UTC (rev 284298)
@@ -2278,7 +2278,7 @@
WEBKIT_COPY_FILES(Copy_WebCoreTestSupportPrivateHeaders
DESTINATION ${WebCore_PRIVATE_FRAMEWORK_HEADERS_DIR}/WebCoreTestSupport
- FILES testing/js/WebCoreTestSupport.h
+ FILES testing/js/WebCoreTestSupport.h testing/cocoa/WebArchiveDumpSupport.h
FLATTENED
)
list(APPEND WebCoreTestSupport_INTERFACE_DEPENDENCIES Copy_WebCoreTestSupportPrivateHeaders)
@@ -2288,7 +2288,7 @@
list(APPEND WebCoreTestSupport_SYSTEM_INCLUDE_DIRECTORIES ${WebCore_SYSTEM_INCLUDE_DIRECTORIES})
if (WebCore_LIBRARY_TYPE STREQUAL SHARED)
- list(APPEND WebCoreTestSupport_LIBRARIES WebCore)
+ list(APPEND WebCoreTestSupport_PRIVATE_LIBRARIES WebCore)
else ()
list(APPEND WebCoreTestSupport_LIBRARIES ${WebCore_LIBRARIES})
list(APPEND WebCoreTestSupport_PRIVATE_LIBRARIES ${WebCore_PRIVATE_LIBRARIES})
Modified: trunk/Source/WebCore/ChangeLog (284297 => 284298)
--- trunk/Source/WebCore/ChangeLog 2021-10-16 00:44:00 UTC (rev 284297)
+++ trunk/Source/WebCore/ChangeLog 2021-10-16 00:44:06 UTC (rev 284298)
@@ -1,3 +1,13 @@
+2021-10-15 Ross Kirsling <ross.kirsl...@sony.com>
+
+ Realize Mac CMake build of WebCore and WebKit
+ https://bugs.webkit.org/show_bug.cgi?id=231749
+
+ Reviewed by Alex Christensen.
+
+ * CMakeLists.txt:
+ * PlatformMac.cmake:
+
2021-10-15 Eric Carlson <eric.carl...@apple.com>
[iOS] Support getDisplayMedia
Modified: trunk/Source/WebCore/PAL/ChangeLog (284297 => 284298)
--- trunk/Source/WebCore/PAL/ChangeLog 2021-10-16 00:44:00 UTC (rev 284297)
+++ trunk/Source/WebCore/PAL/ChangeLog 2021-10-16 00:44:06 UTC (rev 284298)
@@ -1,3 +1,12 @@
+2021-10-15 Ross Kirsling <ross.kirsl...@sony.com>
+
+ Realize Mac CMake build of WebCore and WebKit
+ https://bugs.webkit.org/show_bug.cgi?id=231749
+
+ Reviewed by Alex Christensen.
+
+ * pal/PlatformMac.cmake:
+
2021-10-15 Eric Carlson <eric.carl...@apple.com>
[iOS] Support getDisplayMedia
Modified: trunk/Source/WebCore/PAL/pal/PlatformMac.cmake (284297 => 284298)
--- trunk/Source/WebCore/PAL/pal/PlatformMac.cmake 2021-10-16 00:44:00 UTC (rev 284297)
+++ trunk/Source/WebCore/PAL/pal/PlatformMac.cmake 2021-10-16 00:44:06 UTC (rev 284298)
@@ -53,8 +53,10 @@
spi/cocoa/CFNSURLConnectionSPI.h
spi/cocoa/CommonCryptoSPI.h
spi/cocoa/CoreServicesSPI.h
+ spi/cocoa/CryptoKitPrivateSPI.h
spi/cocoa/DataDetectorsCoreSPI.h
spi/cocoa/FeatureFlagsSPI.h
+ spi/cocoa/FilePortSPI.h
spi/cocoa/IOKitSPI.h
spi/cocoa/IOPMLibSPI.h
spi/cocoa/IOPSLibSPI.h
@@ -89,6 +91,7 @@
spi/cocoa/SecKeyProxySPI.h
spi/cocoa/ServersSPI.h
spi/cocoa/SpeechSPI.h
+ spi/cocoa/TCCSPI.h
spi/cocoa/URLFormattingSPI.h
spi/cocoa/VisionKitCoreSPI.h
spi/cocoa/WebFilterEvaluatorSPI.h
@@ -133,6 +136,7 @@
spi/mac/PIPSPI.h
spi/mac/QuickLookMacSPI.h
spi/mac/SpeechSynthesisSPI.h
+ spi/mac/SystemPreviewSPI.h
spi/mac/TelephonyUtilitiesSPI.h
system/cocoa/SleepDisablerCocoa.h
@@ -156,6 +160,7 @@
cocoa/AppSSOSoftLink.mm
cocoa/AVFoundationSoftLink.mm
+ cocoa/CryptoKitPrivateSoftLink.mm
cocoa/DataDetectorsCoreSoftLink.mm
cocoa/FileSizeFormatterCocoa.mm
cocoa/Gunzip.cpp
Modified: trunk/Source/WebCore/PlatformMac.cmake (284297 => 284298)
--- trunk/Source/WebCore/PlatformMac.cmake 2021-10-16 00:44:00 UTC (rev 284297)
+++ trunk/Source/WebCore/PlatformMac.cmake 2021-10-16 00:44:06 UTC (rev 284298)
@@ -55,8 +55,6 @@
${SYSTEMCONFIGURATION_LIBRARY}
${VIDEOTOOLBOX_LIBRARY}
${XML2_LIBRARY}
- WTF
- bmalloc
opus
usrsctp
vpx
@@ -101,6 +99,7 @@
"${WEBCORE_DIR}/layout/tableformatting"
"${WEBCORE_DIR}/loader/archive/cf"
"${WEBCORE_DIR}/loader/cf"
+ "${WEBCORE_DIR}/loader/cocoa"
"${WEBCORE_DIR}/loader/mac"
"${WEBCORE_DIR}/page/cocoa"
"${WEBCORE_DIR}/page/mac"
@@ -187,6 +186,8 @@
html/HTMLSlotElement.cpp
+ loader/cocoa/PrivateClickMeasurementCocoa.mm
+
page/PageDebuggable.cpp
page/mac/EventHandlerMac.mm
@@ -528,6 +529,8 @@
loader/archive/cf/LegacyWebArchive.h
+ loader/cache/CachedRawResource.h
+
loader/mac/LoaderNSURLExtras.h
Modules/webauthn/AuthenticatorAssertionResponse.h
@@ -553,6 +556,7 @@
page/scrolling/cocoa/ScrollingTreePositionedNode.h
page/scrolling/cocoa/ScrollingTreeStickyNode.h
+ page/scrolling/mac/ScrollingCoordinatorMac.h
page/scrolling/mac/ScrollingTreeFrameScrollingNodeMac.h
page/scrolling/mac/ScrollingTreeOverflowScrollingNodeMac.h
page/scrolling/mac/ScrollingTreeScrollingNodeDelegateMac.h
@@ -938,8 +942,6 @@
testing/MockWebAuthenticationConfiguration.idl
)
-set(CMAKE_SHARED_LINKER_FLAGS ${CMAKE_SHARED_LINKER_FLAGS} "-compatibility_version 1 -current_version ${WEBKIT_MAC_VERSION} -force_load ${CMAKE_BINARY_DIR}/lib/libPAL.a")
-
if (NOT EXISTS ${CMAKE_BINARY_DIR}/WebCore/WebKitAvailability.h)
file(COPY platform/cocoa/WebKitAvailability.h DESTINATION ${CMAKE_BINARY_DIR}/WebCore)
endif ()
Modified: trunk/Source/WebKit/CMakeLists.txt (284297 => 284298)
--- trunk/Source/WebKit/CMakeLists.txt 2021-10-16 00:44:00 UTC (rev 284297)
+++ trunk/Source/WebKit/CMakeLists.txt 2021-10-16 00:44:06 UTC (rev 284298)
@@ -7,6 +7,7 @@
)
set(WebKit_INCLUDE_DIRECTORIES
+ "${PAL_FRAMEWORK_HEADERS_DIR}"
"${WebCore_PRIVATE_FRAMEWORK_HEADERS_DIR}"
"${WebKit_FRAMEWORK_HEADERS_DIR}"
"${WebKit_DERIVED_SOURCES_DIR}"
@@ -249,7 +250,6 @@
WebProcess/GPU/media/RemoteRemoteCommandListener
WebProcess/GPU/media/SourceBufferPrivateRemote
- WebProcess/GPU/webrtc/AudioMediaStreamTrackRendererInternalUnitManager
WebProcess/GPU/webrtc/LibWebRTCCodecs
WebProcess/GPU/webrtc/SampleBufferDisplayLayer
@@ -313,6 +313,7 @@
set(NetworkProcess_LIBRARIES WebKit)
set(GPUProcess_LIBRARIES WebKit)
set(PluginProcess_LIBRARIES WebKit)
+set(WebAuthnProcess_LIBRARIES WebKit)
if (ENABLE_ENCRYPTED_MEDIA AND ENABLE_OPENCDM)
list(APPEND WebKit_SYSTEM_INCLUDE_DIRECTORIES
@@ -419,6 +420,11 @@
list(APPEND WebKit_INTERFACE_DEPENDENCIES PluginProcess)
endif ()
+if (ENABLE_WEB_AUTHN)
+ WEBKIT_EXECUTABLE_DECLARE(WebAuthnProcess)
+ list(APPEND WebKit_INTERFACE_DEPENDENCIES WebAuthnProcess)
+endif ()
+
WEBKIT_FRAMEWORK_DECLARE(WebKit)
WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
@@ -600,6 +606,12 @@
ADD_WEBKIT_PREFIX_HEADER(PluginProcess)
endif ()
+if (ENABLE_WEB_AUTHN)
+ list(APPEND WebAuthnProcess_PRIVATE_INCLUDE_DIRECTORIES $<TARGET_PROPERTY:WebKit,INCLUDE_DIRECTORIES>)
+ WEBKIT_EXECUTABLE(WebAuthnProcess)
+ ADD_WEBKIT_PREFIX_HEADER(WebAuthnProcess)
+endif ()
+
if (COMPILER_IS_GCC_OR_CLANG)
WEBKIT_ADD_TARGET_CXX_FLAGS(WebKit -Wno-unused-parameter)
WEBKIT_ADD_TARGET_CXX_FLAGS(WebProcess -Wno-unused-parameter)
@@ -610,6 +622,9 @@
if (ENABLE_PLUGIN_PROCESS)
WEBKIT_ADD_TARGET_CXX_FLAGS(PluginProcess -Wno-unused-parameter)
endif ()
+ if (ENABLE_WEB_AUTHN)
+ WEBKIT_ADD_TARGET_CXX_FLAGS(WebAuthnProcess -Wno-unused-parameter)
+ endif ()
endif ()
if ("${PORT}" STREQUAL "Mac")
Modified: trunk/Source/WebKit/ChangeLog (284297 => 284298)
--- trunk/Source/WebKit/ChangeLog 2021-10-16 00:44:00 UTC (rev 284297)
+++ trunk/Source/WebKit/ChangeLog 2021-10-16 00:44:06 UTC (rev 284298)
@@ -1,3 +1,13 @@
+2021-10-15 Ross Kirsling <ross.kirsl...@sony.com>
+
+ Realize Mac CMake build of WebCore and WebKit
+ https://bugs.webkit.org/show_bug.cgi?id=231749
+
+ Reviewed by Alex Christensen.
+
+ * CMakeLists.txt:
+ * PlatformMac.cmake:
+
2021-10-15 Eric Carlson <eric.carl...@apple.com>
[iOS] Support getDisplayMedia
Modified: trunk/Source/WebKit/PlatformMac.cmake (284297 => 284298)
--- trunk/Source/WebKit/PlatformMac.cmake 2021-10-16 00:44:00 UTC (rev 284297)
+++ trunk/Source/WebKit/PlatformMac.cmake 2021-10-16 00:44:06 UTC (rev 284298)
@@ -6,6 +6,7 @@
find_library(SECURITY_LIBRARY Security)
find_library(SECURITYINTERFACE_LIBRARY SecurityInterface)
find_library(QUARTZ_LIBRARY Quartz)
+find_library(UNIFORMTYPEIDENTIFIERS_LIBRARY UniformTypeIdentifiers)
find_library(AVFOUNDATION_LIBRARY AVFoundation)
find_library(AVFAUDIO_LIBRARY AVFAudio HINTS ${AVFOUNDATION_LIBRARY}/Versions/*/Frameworks)
find_library(DEVICEIDENTITY_LIBRARY DeviceIdentity HINTS ${CMAKE_OSX_SYSROOT}/System/Library/PrivateFrameworks)
@@ -22,7 +23,6 @@
list(APPEND WebKit_PRIVATE_LIBRARIES
Accessibility
- PAL
WebKitLegacy
${APPLICATIONSERVICES_LIBRARY}
${CORESERVICES_LIBRARY}
@@ -29,6 +29,7 @@
${DEVICEIDENTITY_LIBRARY}
${NETWORK_LIBRARY}
${SECURITYINTERFACE_LIBRARY}
+ ${UNIFORMTYPEIDENTIFIERS_LIBRARY}
)
if (NOT AVFAUDIO_LIBRARY-NOTFOUND)
@@ -54,6 +55,8 @@
NetworkProcess/Downloads/cocoa/WKDownloadProgress.mm
+ Platform/IPC/cocoa/SharedFileHandleCocoa.cpp
+
Shared/API/Cocoa/WKMain.mm
Shared/Cocoa/DefaultWebBrowserChecks.mm
@@ -63,10 +66,13 @@
UIProcess/QuickLookThumbnailLoader.mm
UIProcess/QuickLookThumbnailingSoftLink.mm
+ UIProcess/API/Cocoa/WKContentWorld.mm
UIProcess/API/Cocoa/_WKAuthenticationExtensionsClientOutputs.mm
UIProcess/API/Cocoa/_WKAuthenticatorAssertionResponse.mm
UIProcess/API/Cocoa/_WKAuthenticatorAttestationResponse.mm
UIProcess/API/Cocoa/_WKAuthenticatorResponse.mm
+ UIProcess/API/Cocoa/_WKResourceLoadStatisticsFirstParty.mm
+ UIProcess/API/Cocoa/_WKResourceLoadStatisticsThirdParty.mm
UIProcess/Cocoa/PreferenceObserver.mm
UIProcess/Cocoa/WKSafeBrowsingWarning.mm
@@ -85,12 +91,6 @@
WebProcess/cocoa/LaunchServicesDatabaseManager.mm
)
-list(APPEND WebKit_SOURCES
- UIProcess/API/Cocoa/WKContentWorld.mm
- UIProcess/API/Cocoa/_WKResourceLoadStatisticsFirstParty.mm
- UIProcess/API/Cocoa/_WKResourceLoadStatisticsThirdParty.mm
-)
-
list(APPEND WebKit_PRIVATE_INCLUDE_DIRECTORIES
"${CMAKE_BINARY_DIR}/libwebrtc/PrivateHeaders"
"${ICU_INCLUDE_DIRS}"
@@ -111,6 +111,7 @@
"${WEBKIT_DIR}/UIProcess/Inspector/mac"
"${WEBKIT_DIR}/UIProcess/Launcher/mac"
"${WEBKIT_DIR}/UIProcess/Media/cocoa"
+ "${WEBKIT_DIR}/UIProcess/Notifications/cocoa"
"${WEBKIT_DIR}/UIProcess/PDF"
"${WEBKIT_DIR}/UIProcess/RemoteLayerTree"
"${WEBKIT_DIR}/UIProcess/RemoteLayerTree/cocoa"
@@ -139,6 +140,7 @@
"${WEBKIT_DIR}/Shared/ios"
"${WEBKIT_DIR}/Shared/cf"
"${WEBKIT_DIR}/Shared/Cocoa"
+ "${WEBKIT_DIR}/Shared/Daemon"
"${WEBKIT_DIR}/Shared/EntryPointUtilities/Cocoa/Daemon"
"${WEBKIT_DIR}/Shared/EntryPointUtilities/Cocoa/XPCService"
"${WEBKIT_DIR}/Shared/mac"
@@ -145,8 +147,10 @@
"${WEBKIT_DIR}/Shared/mac/MediaFormatReader"
"${WEBKIT_DIR}/Shared/Plugins/mac"
"${WEBKIT_DIR}/Shared/Scrolling"
+ "${WEBKIT_DIR}/UIProcess/Cocoa/GroupActivities"
"${WEBKIT_DIR}/UIProcess/Media"
"${WEBKIT_DIR}/UIProcess/WebAuthentication/fido"
+ "${WEBKIT_DIR}/WebAuthnProcess/mac"
"${WEBKIT_DIR}/WebProcess/WebAuthentication"
"${WEBKIT_DIR}/WebProcess/cocoa"
"${WEBKIT_DIR}/WebProcess/mac"
@@ -177,6 +181,11 @@
${XPCService_SOURCES}
)
+set(NetworkProcess_SOURCES
+ NetworkProcess/EntryPoint/Cocoa/XPCService/NetworkServiceEntryPoint.mm
+ ${XPCService_SOURCES}
+)
+
set(PluginProcess_SOURCES
PluginProcess/EntryPoint/Cocoa/XPCService/PluginServiceEntryPoint.mm
${XPCService_SOURCES}
@@ -187,8 +196,8 @@
${XPCService_SOURCES}
)
-list(APPEND NetworkProcess_SOURCES
- NetworkProcess/EntryPoint/Cocoa/XPCService/NetworkServiceEntryPoint.mm
+set(WebAuthnProcess_SOURCES
+ WebAuthnProcess/EntryPoint/Cocoa/XPCService/WebAuthnServiceEntryPoint.mm
${XPCService_SOURCES}
)
@@ -195,6 +204,9 @@
# FIXME: These should not have Development in production builds.
set(WebProcess_OUTPUT_NAME com.apple.WebKit.WebContent.Development)
set(NetworkProcess_OUTPUT_NAME com.apple.WebKit.Networking.Development)
+set(PluginProcess_OUTPUT_NAME com.apple.WebKit.Plugin.64.Development)
+set(GPUProcess_OUTPUT_NAME com.apple.WebKit.GPU.Development)
+set(WebAuthnProcess_OUTPUT_NAME com.apple.WebKit.WebAuthn.Development)
set(WebProcess_INCLUDE_DIRECTORIES ${CMAKE_BINARY_DIR})
set(NetworkProcess_INCLUDE_DIRECTORIES ${CMAKE_BINARY_DIR})
@@ -289,6 +301,12 @@
Shared/API/Cocoa/_WKRenderingProgressEvents.h
Shared/API/Cocoa/_WKSameDocumentNavigationType.h
+ Shared/API/c/cf/WKErrorCF.h
+ Shared/API/c/cf/WKStringCF.h
+ Shared/API/c/cf/WKURLCF.h
+
+ Shared/API/c/cg/WKImageCG.h
+
Shared/API/c/mac/WKBaseMac.h
Shared/API/c/mac/WKCertificateInfoMac.h
Shared/API/c/mac/WKMediaFormatReader.h
@@ -298,6 +316,11 @@
Shared/API/c/mac/WKWebArchiveRef.h
Shared/API/c/mac/WKWebArchiveResource.h
+ UIProcess/API/C/mac/WKContextPrivateMac.h
+ UIProcess/API/C/mac/WKInspectorPrivateMac.h
+ UIProcess/API/C/mac/WKPagePrivateMac.h
+ UIProcess/API/C/mac/WKProtectionSpaceNS.h
+
UIProcess/API/Cocoa/NSAttributedString.h
UIProcess/API/Cocoa/NSAttributedStringPrivate.h
UIProcess/API/Cocoa/PageLoadStateObserver.h
@@ -430,6 +453,7 @@
UIProcess/API/Cocoa/_WKInspectorExtension.h
UIProcess/API/Cocoa/_WKInspectorExtensionDelegate.h
UIProcess/API/Cocoa/_WKInspectorExtensionHost.h
+ UIProcess/API/Cocoa/_WKInspectorIBActions.h
UIProcess/API/Cocoa/_WKInspectorPrivate.h
UIProcess/API/Cocoa/_WKInspectorPrivateForTesting.h
UIProcess/API/Cocoa/_WKInspectorWindow.h
@@ -782,14 +806,57 @@
${WEBKIT_DIR}/NetworkProcess/EntryPoint/Cocoa/XPCService/NetworkService/Info-OSX.plist
${NetworkProcess_OUTPUT_NAME})
+ if (ENABLE_PLUGIN_PROCESS)
+ WEBKIT_XPC_SERVICE(PluginProcess
+ "com.apple.WebKit.Plugin.64"
+ ${WEBKIT_DIR}/PluginProcess/EntryPoint/Cocoa/XPCService/PluginService.Info.plist
+ ${PluginProcess_OUTPUT_NAME})
+ endif ()
+
+ if (ENABLE_GPU_PROCESS)
+ WEBKIT_XPC_SERVICE(GPUProcess
+ "com.apple.WebKit.GPU"
+ ${WEBKIT_DIR}/GPUProcess/EntryPoint/Cocoa/XPCService/GPUService/Info-OSX.plist
+ ${GPUProcess_OUTPUT_NAME})
+ endif ()
+
+ if (ENABLE_WEB_AUTHN)
+ WEBKIT_XPC_SERVICE(WebAuthnProcess
+ "com.apple.WebKit.WebAuthn"
+ ${WEBKIT_DIR}/WebAuthnProcess/EntryPoint/Cocoa/XPCService/WebAuthnService/Info-OSX.plist
+ ${WebAuthnProcess_OUTPUT_NAME})
+ endif ()
+
set(WebKit_RESOURCES_DIR ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/WebKit.framework/Versions/A/Resources)
add_custom_command(OUTPUT ${WebKit_RESOURCES_DIR}/com.apple.WebProcess.sb COMMAND
grep -o "^[^;]*" ${WEBKIT_DIR}/WebProcess/com.apple.WebProcess.sb.in | clang -E -P -w -include wtf/Platform.h -I ${WTF_FRAMEWORK_HEADERS_DIR} -I ${bmalloc_FRAMEWORK_HEADERS_DIR} -I ${WEBKIT_DIR} - > ${WebKit_RESOURCES_DIR}/com.apple.WebProcess.sb
VERBATIM)
+ list(APPEND WebKit_SB_FILES ${WebKit_RESOURCES_DIR}/com.apple.WebProcess.sb)
+
add_custom_command(OUTPUT ${WebKit_RESOURCES_DIR}/com.apple.WebKit.NetworkProcess.sb COMMAND
grep -o "^[^;]*" ${WEBKIT_DIR}/NetworkProcess/mac/com.apple.WebKit.NetworkProcess.sb.in | clang -E -P -w -include wtf/Platform.h -I ${WTF_FRAMEWORK_HEADERS_DIR} -I ${bmalloc_FRAMEWORK_HEADERS_DIR} -I ${WEBKIT_DIR} - > ${WebKit_RESOURCES_DIR}/com.apple.WebKit.NetworkProcess.sb
VERBATIM)
- add_custom_target(WebKitSandboxProfiles ALL DEPENDS ${WebKit_RESOURCES_DIR}/com.apple.WebProcess.sb ${WebKit_RESOURCES_DIR}/com.apple.WebKit.NetworkProcess.sb)
+ list(APPEND WebKit_SB_FILES ${WebKit_RESOURCES_DIR}/com.apple.WebKit.NetworkProcess.sb)
+
+ if (ENABLE_PLUGIN_PROCESS)
+ add_custom_command(OUTPUT ${WebKit_RESOURCES_DIR}/com.apple.WebKit.plugin-common.sb COMMAND
+ grep -o "^[^;]*" ${WEBKIT_DIR}/PluginProcess/mac/com.apple.WebKit.plugin-common.sb.in | clang -E -P -w -include wtf/Platform.h -I ${WTF_FRAMEWORK_HEADERS_DIR} -I ${bmalloc_FRAMEWORK_HEADERS_DIR} -I ${WEBKIT_DIR} - > ${WebKit_RESOURCES_DIR}/com.apple.WebKit.plugin-common.sb
+ VERBATIM)
+ list(APPEND WebKit_SB_FILES ${WebKit_RESOURCES_DIR}/com.apple.WebKit.plugin-common.sb)
+ endif ()
+ if (ENABLE_GPU_PROCESS)
+ add_custom_command(OUTPUT ${WebKit_RESOURCES_DIR}/com.apple.WebKit.GPUProcess.sb COMMAND
+ grep -o "^[^;]*" ${WEBKIT_DIR}/GPUProcess/mac/com.apple.WebKit.GPUProcess.sb.in | clang -E -P -w -include wtf/Platform.h -I ${WTF_FRAMEWORK_HEADERS_DIR} -I ${bmalloc_FRAMEWORK_HEADERS_DIR} -I ${WEBKIT_DIR} - > ${WebKit_RESOURCES_DIR}/com.apple.WebKit.GPUProcess.sb
+ VERBATIM)
+ list(APPEND WebKit_SB_FILES ${WebKit_RESOURCES_DIR}/com.apple.WebKit.GPUProcess.sb)
+ endif ()
+ if (ENABLE_WEB_AUTHN)
+ add_custom_command(OUTPUT ${WebKit_RESOURCES_DIR}/com.apple.WebKit.WebAuthnProcess.sb COMMAND
+ grep -o "^[^;]*" ${WEBKIT_DIR}/WebAuthnProcess/mac/com.apple.WebKit.WebAuthnProcess.sb.in | clang -E -P -w -include wtf/Platform.h -I ${WTF_FRAMEWORK_HEADERS_DIR} -I ${bmalloc_FRAMEWORK_HEADERS_DIR} -I ${WEBKIT_DIR} - > ${WebKit_RESOURCES_DIR}/com.apple.WebKit.WebAuthnProcess.sb
+ VERBATIM)
+ list(APPEND WebKit_SB_FILES ${WebKit_RESOURCES_DIR}/com.apple.WebKit.WebAuthnProcess.sb)
+ endif ()
+ add_custom_target(WebKitSandboxProfiles ALL DEPENDS ${WebKit_SB_FILES})
add_dependencies(WebKit WebKitSandboxProfiles)
add_custom_command(OUTPUT ${WebKit_XPC_SERVICE_DIR}/com.apple.WebKit.WebContent.xpc/Contents/Resources/WebContentProcess.nib COMMAND
Modified: trunk/Source/cmake/OptionsMac.cmake (284297 => 284298)
--- trunk/Source/cmake/OptionsMac.cmake 2021-10-16 00:44:00 UTC (rev 284297)
+++ trunk/Source/cmake/OptionsMac.cmake 2021-10-16 00:44:06 UTC (rev 284298)
@@ -7,7 +7,8 @@
# we need a value different from the default defined in WebKitFeatures.cmake.
# FIXME: Many of these defaults differ from the XCode build.
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_OVERFLOW_SCROLLING_TOUCH PRIVATE ON)
-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_API_TESTS PRIVATE ON)
+# FIXME: https://bugs.webkit.org/show_bug.cgi?id=231776
+# WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_API_TESTS PRIVATE ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ASYNC_SCROLLING PRIVATE ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CONTENT_EXTENSIONS PRIVATE ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS3_TEXT PRIVATE OFF)
@@ -108,9 +109,11 @@
set(ENABLE_WEBKIT ON)
set(USE_ANGLE_WEBGL ON)
+set(bmalloc_LIBRARY_TYPE OBJECT)
+set(WTF_LIBRARY_TYPE OBJECT)
set(_javascript_Core_LIBRARY_TYPE SHARED)
+set(PAL_LIBRARY_TYPE OBJECT)
set(WebCore_LIBRARY_TYPE SHARED)
-set(WebCoreTestSupport_LIBRARY_TYPE SHARED)
find_package(ICU 61.2 REQUIRED COMPONENTS data i18n uc)
find_package(LibXml2 2.8.0 REQUIRED)
Modified: trunk/Source/cmake/WebKitMacros.cmake (284297 => 284298)
--- trunk/Source/cmake/WebKitMacros.cmake 2021-10-16 00:44:00 UTC (rev 284297)
+++ trunk/Source/cmake/WebKitMacros.cmake 2021-10-16 00:44:06 UTC (rev 284298)
@@ -242,7 +242,12 @@
list(REMOVE_DUPLICATES _public_frameworks)
endif ()
foreach (framework IN LISTS _public_frameworks)
- list(APPEND ${_target_name}_LIBRARIES WebKit::${framework})
+ # FIXME: https://bugs.webkit.org/show_bug.cgi?id=231774
+ if (APPLE)
+ list(APPEND ${_target_name}_PRIVATE_LIBRARIES WebKit::${framework})
+ else ()
+ list(APPEND ${_target_name}_LIBRARIES WebKit::${framework})
+ endif ()
endforeach ()
# Add to the ${target_name}_PRIVATE_LIBRARIES
Modified: trunk/Tools/ChangeLog (284297 => 284298)
--- trunk/Tools/ChangeLog 2021-10-16 00:44:00 UTC (rev 284297)
+++ trunk/Tools/ChangeLog 2021-10-16 00:44:06 UTC (rev 284298)
@@ -1,3 +1,12 @@
+2021-10-15 Ross Kirsling <ross.kirsl...@sony.com>
+
+ Realize Mac CMake build of WebCore and WebKit
+ https://bugs.webkit.org/show_bug.cgi?id=231749
+
+ Reviewed by Alex Christensen.
+
+ * PlatformMac.cmake:
+
2021-10-15 Jonathan Bedard <jbed...@apple.com>
[webkitscmpy] Allow repositories to define custom setup commands
Modified: trunk/Tools/PlatformMac.cmake (284297 => 284298)
--- trunk/Tools/PlatformMac.cmake 2021-10-16 00:44:00 UTC (rev 284297)
+++ trunk/Tools/PlatformMac.cmake 2021-10-16 00:44:06 UTC (rev 284298)
@@ -1,4 +1,5 @@
-add_subdirectory(TestRunnerShared)
-add_subdirectory(DumpRenderTree)
-add_subdirectory(WebKitTestRunner)
-add_subdirectory(MiniBrowser/mac)
+# FIXME: https://bugs.webkit.org/show_bug.cgi?id=231776
+# add_subdirectory(TestRunnerShared)
+# add_subdirectory(DumpRenderTree)
+# add_subdirectory(WebKitTestRunner)
+# add_subdirectory(MiniBrowser/mac)
