Diff
Modified: trunk/ChangeLog (263880 => 263881)
--- trunk/ChangeLog 2020-07-03 03:19:55 UTC (rev 263880)
+++ trunk/ChangeLog 2020-07-03 03:40:51 UTC (rev 263881)
@@ -1,3 +1,9 @@
+2020-07-02 Alex Christensen <[email protected]>
+
+ Update Mac CMake build
+
+ * Source/cmake/OptionsMac.cmake:
+
2020-07-01 Don Olmstead <[email protected]>
[CMake] Add WOFF2 targets
Modified: trunk/Source/_javascript_Core/ChangeLog (263880 => 263881)
--- trunk/Source/_javascript_Core/ChangeLog 2020-07-03 03:19:55 UTC (rev 263880)
+++ trunk/Source/_javascript_Core/ChangeLog 2020-07-03 03:40:51 UTC (rev 263881)
@@ -1,3 +1,9 @@
+2020-07-02 Alex Christensen <[email protected]>
+
+ Update Mac CMake build
+
+ * PlatformMac.cmake:
+
2020-07-02 Yusuke Suzuki <[email protected]>
[JSC] Configure option-offered numberingSystem in Intl.NumberFormat through locale
Modified: trunk/Source/_javascript_Core/PlatformMac.cmake (263880 => 263881)
--- trunk/Source/_javascript_Core/PlatformMac.cmake 2020-07-03 03:19:55 UTC (rev 263880)
+++ trunk/Source/_javascript_Core/PlatformMac.cmake 2020-07-03 03:40:51 UTC (rev 263881)
@@ -10,6 +10,7 @@
)
list(APPEND _javascript_Core_PRIVATE_INCLUDE_DIRECTORIES
+ ${DERIVED_SOURCES_DIR}
${_javascript_CORE_DIR}/disassembler/udis86
${_javascript_CORE_DIR}/inspector/cocoa
${_javascript_CORE_DIR}/inspector/remote/cocoa
@@ -36,21 +37,21 @@
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")
# FIXME: Make including these files consistent in the source so these forwarding headers are not needed.
-if (NOT EXISTS ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/AugmentableInspectorControllerClient.h)
- file(WRITE ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/AugmentableInspectorControllerClient.h "#include \"inspector/augmentable/AugmentableInspectorControllerClient.h\"")
+if (NOT EXISTS ${_javascript_Core_DERIVED_SOURCES_DIR}/AugmentableInspectorControllerClient.h)
+ file(WRITE ${_javascript_Core_DERIVED_SOURCES_DIR}/AugmentableInspectorControllerClient.h "#include \"inspector/augmentable/AugmentableInspectorControllerClient.h\"")
endif ()
-if (NOT EXISTS ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorFrontendRouter.h)
- file(WRITE ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorFrontendRouter.h "#include \"inspector/InspectorFrontendRouter.h\"")
+if (NOT EXISTS ${_javascript_Core_DERIVED_SOURCES_DIR}/InspectorFrontendRouter.h)
+ file(WRITE ${_javascript_Core_DERIVED_SOURCES_DIR}/InspectorFrontendRouter.h "#include \"inspector/InspectorFrontendRouter.h\"")
endif ()
-if (NOT EXISTS ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorBackendDispatcher.h)
- file(WRITE ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorBackendDispatcher.h "#include \"inspector/InspectorBackendDispatcher.h\"")
+if (NOT EXISTS ${_javascript_Core_DERIVED_SOURCES_DIR}/InspectorBackendDispatcher.h)
+ file(WRITE ${_javascript_Core_DERIVED_SOURCES_DIR}/InspectorBackendDispatcher.h "#include \"inspector/InspectorBackendDispatcher.h\"")
endif ()
-if (NOT EXISTS ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorBackendDispatchers.h)
- file(WRITE ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorBackendDispatchers.h "#include \"inspector/InspectorBackendDispatchers.h\"")
+if (NOT EXISTS ${_javascript_Core_DERIVED_SOURCES_DIR}/InspectorBackendDispatchers.h)
+ file(WRITE ${_javascript_Core_DERIVED_SOURCES_DIR}/InspectorBackendDispatchers.h "#include \"inspector/InspectorBackendDispatchers.h\"")
endif ()
-if (NOT EXISTS ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorFrontendDispatchers.h)
- file(WRITE ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorFrontendDispatchers.h "#include \"inspector/InspectorFrontendDispatchers.h\"")
+if (NOT EXISTS ${_javascript_Core_DERIVED_SOURCES_DIR}/InspectorFrontendDispatchers.h)
+ file(WRITE ${_javascript_Core_DERIVED_SOURCES_DIR}/InspectorFrontendDispatchers.h "#include \"inspector/InspectorFrontendDispatchers.h\"")
endif ()
-if (NOT EXISTS ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorProtocolObjects.h)
- file(WRITE ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorProtocolObjects.h "#include \"inspector/InspectorProtocolObjects.h\"")
+if (NOT EXISTS ${_javascript_Core_DERIVED_SOURCES_DIR}/InspectorProtocolObjects.h)
+ file(WRITE ${_javascript_Core_DERIVED_SOURCES_DIR}/InspectorProtocolObjects.h "#include \"inspector/InspectorProtocolObjects.h\"")
endif ()
Modified: trunk/Source/WebCore/ChangeLog (263880 => 263881)
--- trunk/Source/WebCore/ChangeLog 2020-07-03 03:19:55 UTC (rev 263880)
+++ trunk/Source/WebCore/ChangeLog 2020-07-03 03:40:51 UTC (rev 263881)
@@ -1,3 +1,9 @@
+2020-07-02 Alex Christensen <[email protected]>
+
+ Update Mac CMake build
+
+ * PlatformMac.cmake:
+
2020-07-02 Said Abou-Hallawa <[email protected]>
MIMETypeRegistry::getExtensionsForMIMEType() needs to handle wildcard MIME types
Modified: trunk/Source/WebCore/PlatformMac.cmake (263880 => 263881)
--- trunk/Source/WebCore/PlatformMac.cmake 2020-07-03 03:19:55 UTC (rev 263880)
+++ trunk/Source/WebCore/PlatformMac.cmake 2020-07-03 03:40:51 UTC (rev 263881)
@@ -196,7 +196,6 @@
platform/audio/mac/AudioDestinationMac.cpp
platform/audio/mac/AudioFileReaderMac.cpp
platform/audio/mac/AudioHardwareListenerMac.cpp
- platform/audio/mac/AudioSessionMac.cpp
platform/audio/mac/CARingBuffer.cpp
platform/audio/mac/FFTFrameMac.cpp
@@ -357,10 +356,7 @@
platform/graphics/opentype/OpenTypeCG.cpp
platform/graphics/opentype/OpenTypeMathData.cpp
- platform/mac/BlacklistUpdater.mm
platform/mac/CursorMac.mm
- platform/mac/DragDataMac.mm
- platform/mac/DragImageMac.mm
platform/mac/KeyEventMac.mm
platform/mac/LocalCurrentGraphicsContextMac.mm
platform/mac/LoggingMac.mm
@@ -372,7 +368,6 @@
platform/mac/PlatformPasteboardMac.mm
platform/mac/PlatformScreenMac.mm
platform/mac/PlatformSpeechSynthesizerMac.mm
- platform/mac/PluginBlacklist.mm
platform/mac/PowerObserverMac.cpp
platform/mac/PublicSuffixMac.mm
platform/mac/RemoteCommandListenerMac.mm
@@ -392,7 +387,6 @@
platform/mac/WebCoreFullScreenWindow.mm
platform/mac/WebCoreNSURLExtras.mm
platform/mac/WebCoreObjCExtras.mm
- platform/mac/WebGLBlacklist.mm
platform/mac/WebNSAttributedStringExtras.mm
platform/mac/WidgetMac.mm
@@ -519,7 +513,6 @@
platform/cocoa/LocalCurrentGraphicsContext.h
platform/cocoa/NetworkExtensionContentFilter.h
platform/cocoa/PlatformView.h
- platform/cocoa/PlaybackSessionInterface.h
platform/cocoa/PlaybackSessionModel.h
platform/cocoa/PlaybackSessionModelMediaElement.h
platform/cocoa/ScrollController.h
@@ -581,7 +574,6 @@
platform/mac/PasteboardWriter.h
platform/mac/PlatformEventFactoryMac.h
platform/mac/PlaybackSessionInterfaceMac.h
- platform/mac/PluginBlacklist.h
platform/mac/ScrollbarThemeMac.h
platform/mac/StringUtilities.h
platform/mac/VideoFullscreenInterfaceMac.h
@@ -591,7 +583,6 @@
platform/mac/WebCoreNSURLExtras.h
platform/mac/WebCoreObjCExtras.h
platform/mac/WebCoreView.h
- platform/mac/WebGLBlacklist.h
platform/mac/WebNSAttributedStringExtras.h
platform/mac/WebPlaybackControlsManager.h
@@ -633,6 +624,10 @@
Modules/applepay/ApplePayError.idl
Modules/applepay/ApplePayErrorCode.idl
Modules/applepay/ApplePayErrorContactField.idl
+ Modules/applepay/ApplePayInstallmentItem.idl
+ Modules/applepay/ApplePayInstallmentItemType.idl
+ Modules/applepay/ApplePayInstallmentConfiguration.idl
+ Modules/applepay/ApplePayInstallmentRetailChannel.idl
Modules/applepay/ApplePayLineItem.idl
Modules/applepay/ApplePayMerchantCapability.idl
Modules/applepay/ApplePayPayment.idl
@@ -648,6 +643,11 @@
Modules/applepay/ApplePayRequestBase.idl
Modules/applepay/ApplePaySession.idl
Modules/applepay/ApplePaySessionError.idl
+ Modules/applepay/ApplePaySetup.idl
+ Modules/applepay/ApplePaySetupConfiguration.idl
+ Modules/applepay/ApplePaySetupFeature.idl
+ Modules/applepay/ApplePaySetupFeatureState.idl
+ Modules/applepay/ApplePaySetupFeatureType.idl
Modules/applepay/ApplePayShippingContactSelectedEvent.idl
Modules/applepay/ApplePayShippingContactUpdate.idl
Modules/applepay/ApplePayShippingMethod.idl
Modified: trunk/Source/WebKit/ChangeLog (263880 => 263881)
--- trunk/Source/WebKit/ChangeLog 2020-07-03 03:19:55 UTC (rev 263880)
+++ trunk/Source/WebKit/ChangeLog 2020-07-03 03:40:51 UTC (rev 263881)
@@ -1,3 +1,9 @@
+2020-07-02 Alex Christensen <[email protected]>
+
+ Update Mac CMake build
+
+ * PlatformMac.cmake:
+
2020-07-02 Kate Cheney <[email protected]>
Custom URL schemes should be treated as app-bound
Modified: trunk/Source/WebKit/PlatformMac.cmake (263880 => 263881)
--- trunk/Source/WebKit/PlatformMac.cmake 2020-07-03 03:19:55 UTC (rev 263880)
+++ trunk/Source/WebKit/PlatformMac.cmake 2020-07-03 03:40:51 UTC (rev 263881)
@@ -163,24 +163,8 @@
)
list(APPEND WebKit_MESSAGES_IN_FILES
- GPUProcess/GPUConnectionToWebProcess.messages.in
- GPUProcess/GPUProcess.messages.in
+ GPUProcess/media/ios/RemoteMediaSessionHelperProxy.messages.in
- GPUProcess/media/RemoteAudioDestinationManager.messages.in
- GPUProcess/media/RemoteMediaPlayerManagerProxy.messages.in
- GPUProcess/media/RemoteMediaPlayerProxy.messages.in
- GPUProcess/media/RemoteMediaResourceManager.messages.in
-
- GPUProcess/webrtc/LibWebRTCCodecsProxy.messages.in
- GPUProcess/webrtc/RemoteSampleBufferDisplayLayerManager.messages.in
- GPUProcess/webrtc/RemoteAudioMediaStreamTrackRendererManager.messages.in
- GPUProcess/webrtc/RemoteMediaRecorderManager.messages.in
- GPUProcess/webrtc/RemoteSampleBufferDisplayLayer.messages.in
- GPUProcess/webrtc/RemoteSampleBufferDisplayLayerManager.messages.in
- GPUProcess/webrtc/RemoteMediaRecorder.messages.in
- GPUProcess/webrtc/RemoteAudioMediaStreamTrackRenderer.messages.in
- GPUProcess/webrtc/RemoteSampleBufferDisplayLayerManager.messages.in
-
NetworkProcess/CustomProtocols/LegacyCustomProtocolManager.messages.in
Shared/ApplePay/WebPaymentCoordinatorProxy.messages.in
@@ -193,8 +177,6 @@
UIProcess/Cocoa/UserMediaCaptureManagerProxy.messages.in
UIProcess/Cocoa/VideoFullscreenManagerProxy.messages.in
- UIProcess/GPU/GPUProcessProxy.messages.in
-
UIProcess/Network/CustomProtocols/LegacyCustomProtocolManagerProxy.messages.in
UIProcess/RemoteLayerTree/RemoteLayerTreeDrawingAreaProxy.messages.in
@@ -212,11 +194,8 @@
WebProcess/cocoa/UserMediaCaptureManager.messages.in
WebProcess/cocoa/VideoFullscreenManager.messages.in
- WebProcess/GPU/GPUProcessConnection.messages.in
+ WebProcess/GPU/media/ios/RemoteMediaSessionHelper.messages.in
- WebProcess/GPU/webrtc/LibWebRTCCodecs.messages.in
- WebProcess/GPU/webrtc/SampleBufferDisplayLayer.messages.in
-
WebProcess/WebPage/ViewGestureGeometryCollector.messages.in
WebProcess/WebPage/ViewUpdateDispatcher.messages.in
Modified: trunk/Source/WebKitLegacy/ChangeLog (263880 => 263881)
--- trunk/Source/WebKitLegacy/ChangeLog 2020-07-03 03:19:55 UTC (rev 263880)
+++ trunk/Source/WebKitLegacy/ChangeLog 2020-07-03 03:40:51 UTC (rev 263881)
@@ -1,3 +1,9 @@
+2020-07-02 Alex Christensen <[email protected]>
+
+ Update Mac CMake build
+
+ * PlatformMac.cmake:
+
2020-06-17 Darryl Pogue <[email protected]>
IndexedDB: Support IDBFactory databases method
Modified: trunk/Source/WebKitLegacy/PlatformMac.cmake (263880 => 263881)
--- trunk/Source/WebKitLegacy/PlatformMac.cmake 2020-07-03 03:19:55 UTC (rev 263880)
+++ trunk/Source/WebKitLegacy/PlatformMac.cmake 2020-07-03 03:40:51 UTC (rev 263881)
@@ -680,7 +680,6 @@
FILES ${WebKitLegacy_FORWARDING_HEADERS_FILES}
FLATTENED
)
-add_dependencies(WebKitLegacyFrameworkHeaders WebCorePrivateFrameworkHeaders)
set(WebKitLegacy_OUTPUT_NAME WebKitLegacy)
Modified: trunk/Source/cmake/OptionsMac.cmake (263880 => 263881)
--- trunk/Source/cmake/OptionsMac.cmake 2020-07-03 03:19:55 UTC (rev 263880)
+++ trunk/Source/cmake/OptionsMac.cmake 2020-07-03 03:40:51 UTC (rev 263881)
@@ -117,3 +117,5 @@
set(WebCoreTestSupport_LIBRARY_TYPE SHARED)
find_package(ICU 60.2 REQUIRED COMPONENTS data i18n uc)
+find_package(LibXml2 2.8.0 REQUIRED)
+find_package(LibXslt 1.1.7 REQUIRED)
Modified: trunk/Tools/ChangeLog (263880 => 263881)
--- trunk/Tools/ChangeLog 2020-07-03 03:19:55 UTC (rev 263880)
+++ trunk/Tools/ChangeLog 2020-07-03 03:40:51 UTC (rev 263881)
@@ -1,5 +1,12 @@
2020-07-02 Alex Christensen <[email protected]>
+ Update Mac CMake build
+
+ * DumpRenderTree/PlatformMac.cmake:
+ * WebKitTestRunner/PlatformMac.cmake:
+
+2020-07-02 Alex Christensen <[email protected]>
+
Add testing infrastructure and SPI declaration for HTTP/2 ping
https://bugs.webkit.org/show_bug.cgi?id=213913
Modified: trunk/Tools/DumpRenderTree/PlatformMac.cmake (263880 => 263881)
--- trunk/Tools/DumpRenderTree/PlatformMac.cmake 2020-07-03 03:19:55 UTC (rev 263880)
+++ trunk/Tools/DumpRenderTree/PlatformMac.cmake 2020-07-03 03:40:51 UTC (rev 263881)
@@ -23,12 +23,12 @@
)
list(APPEND DumpRenderTree_INCLUDE_DIRECTORIES
- cg
- cf
- cocoa
- mac
- mac/InternalHeaders/WebKit
- TestNetscapePlugIn
+ ${DumpRenderTree_DIR}/cg
+ ${DumpRenderTree_DIR}/cf
+ ${DumpRenderTree_DIR}/cocoa
+ ${DumpRenderTree_DIR}/mac
+ ${DumpRenderTree_DIR}/mac/InternalHeaders/WebKit
+ ${DumpRenderTree_DIR}/TestNetscapePlugIn
${FORWARDING_HEADERS_DIR}
${FORWARDING_HEADERS_DIR}/WebCore
${FORWARDING_HEADERS_DIR}/WebKit
@@ -35,9 +35,9 @@
${FORWARDING_HEADERS_DIR}/WebKitLegacy
${WEBCORE_DIR}/testing/cocoa
${WEBKITLEGACY_DIR}
- ${WEBKIT_TESTRUNNER_SHARED_DIR}/cocoa
- ${WEBKIT_TESTRUNNER_SHARED_DIR}/mac
- ${WEBKIT_TESTRUNNER_SHARED_DIR}/spi
+ ${WebKitTestRunner_SHARED_DIR}/cocoa
+ ${WebKitTestRunner_SHARED_DIR}/mac
+ ${WebKitTestRunner_SHARED_DIR}/spi
)
# Common ${TestNetscapePlugIn_SOURCES} from CMakeLists.txt are C++ source files.
@@ -101,8 +101,8 @@
mac/UIDelegate.mm
mac/UIScriptControllerMac.mm
mac/WorkQueueItemMac.mm
- ${WEBKIT_TESTRUNNER_SHARED_DIR}/cocoa/ClassMethodSwizzler.mm
- ${WEBKIT_TESTRUNNER_SHARED_DIR}/cocoa/LayoutTestSpellChecker.mm
+ ${WebKitTestRunner_SHARED_DIR}/cocoa/ClassMethodSwizzler.mm
+ ${WebKitTestRunner_SHARED_DIR}/cocoa/LayoutTestSpellChecker.mm
)
set(DumpRenderTree_SOURCES
Modified: trunk/Tools/WebKitTestRunner/PlatformMac.cmake (263880 => 263881)
--- trunk/Tools/WebKitTestRunner/PlatformMac.cmake 2020-07-03 03:19:55 UTC (rev 263880)
+++ trunk/Tools/WebKitTestRunner/PlatformMac.cmake 2020-07-03 03:40:51 UTC (rev 263881)
@@ -26,34 +26,32 @@
${ICU_INCLUDE_DIRS}
${WEBCORE_DIR}/testing/cocoa
${WEBKITLEGACY_DIR}
- ${WEBKIT_TESTRUNNER_DIR}/cf
- ${WEBKIT_TESTRUNNER_DIR}/cg
- ${WEBKIT_TESTRUNNER_DIR}/cocoa
- ${WEBKIT_TESTRUNNER_DIR}/mac
- ${WEBKIT_TESTRUNNER_INJECTEDBUNDLE_DIR}/mac
- ${WEBKIT_TESTRUNNER_SHARED_DIR}/EventSerialization/mac
- ${WEBKIT_TESTRUNNER_SHARED_DIR}/cocoa
- ${WEBKIT_TESTRUNNER_SHARED_DIR}/mac
- ${WEBKIT_TESTRUNNER_SHARED_DIR}/spi
+ ${WebKitTestRunner_DIR}/cf
+ ${WebKitTestRunner_DIR}/cg
+ ${WebKitTestRunner_DIR}/cocoa
+ ${WebKitTestRunner_DIR}/mac
+ ${WebKitTestRunner_DIR}/InjectedBundle/mac
+ ${WebKitTestRunner_SHARED_DIR}/EventSerialization/mac
+ ${WebKitTestRunner_SHARED_DIR}/cocoa
+ ${WebKitTestRunner_SHARED_DIR}/mac
+ ${WebKitTestRunner_SHARED_DIR}/spi
)
list(APPEND WebKitTestRunnerInjectedBundle_SOURCES
- ${WEBKIT_TESTRUNNER_DIR}/cocoa/CrashReporterInfo.mm
+ ${WebKitTestRunner_DIR}/InjectedBundle/cocoa/ActivateFontsCocoa.mm
+ ${WebKitTestRunner_DIR}/InjectedBundle/cocoa/InjectedBundlePageCocoa.mm
- ${WEBKIT_TESTRUNNER_INJECTEDBUNDLE_DIR}/cocoa/ActivateFontsCocoa.mm
- ${WEBKIT_TESTRUNNER_INJECTEDBUNDLE_DIR}/cocoa/InjectedBundlePageCocoa.mm
+ ${WebKitTestRunner_DIR}/InjectedBundle/mac/AccessibilityControllerMac.mm
+ ${WebKitTestRunner_DIR}/InjectedBundle/mac/AccessibilityNotificationHandler.mm
+ ${WebKitTestRunner_DIR}/InjectedBundle/mac/AccessibilityTextMarkerRangeMac.mm
+ ${WebKitTestRunner_DIR}/InjectedBundle/mac/InjectedBundleMac.mm
+ ${WebKitTestRunner_DIR}/InjectedBundle/mac/AccessibilityCommonMac.mm
+ ${WebKitTestRunner_DIR}/InjectedBundle/mac/AccessibilityTextMarkerMac.mm
+ ${WebKitTestRunner_DIR}/InjectedBundle/mac/AccessibilityUIElementMac.mm
+ ${WebKitTestRunner_DIR}/InjectedBundle/mac/TestRunnerMac.mm
- ${WEBKIT_TESTRUNNER_INJECTEDBUNDLE_DIR}/mac/AccessibilityControllerMac.mm
- ${WEBKIT_TESTRUNNER_INJECTEDBUNDLE_DIR}/mac/AccessibilityNotificationHandler.mm
- ${WEBKIT_TESTRUNNER_INJECTEDBUNDLE_DIR}/mac/AccessibilityTextMarkerRangeMac.mm
- ${WEBKIT_TESTRUNNER_INJECTEDBUNDLE_DIR}/mac/InjectedBundleMac.mm
- ${WEBKIT_TESTRUNNER_INJECTEDBUNDLE_DIR}/mac/AccessibilityCommonMac.mm
- ${WEBKIT_TESTRUNNER_INJECTEDBUNDLE_DIR}/mac/AccessibilityTextMarkerMac.mm
- ${WEBKIT_TESTRUNNER_INJECTEDBUNDLE_DIR}/mac/AccessibilityUIElementMac.mm
- ${WEBKIT_TESTRUNNER_INJECTEDBUNDLE_DIR}/mac/TestRunnerMac.mm
-
- ${WEBKIT_TESTRUNNER_SHARED_DIR}/EventSerialization/mac/EventSerializerMac.mm
- ${WEBKIT_TESTRUNNER_SHARED_DIR}/EventSerialization/mac/SharedEventStreamsMac.mm
+ ${WebKitTestRunner_SHARED_DIR}/EventSerialization/mac/EventSerializerMac.mm
+ ${WebKitTestRunner_SHARED_DIR}/EventSerialization/mac/SharedEventStreamsMac.mm
)
list(APPEND WebKitTestRunnerInjectedBundle_LIBRARIES
@@ -66,30 +64,27 @@
set(CMAKE_SHARED_LINKER_FLAGS ${CMAKE_SHARED_LINKER_FLAGS} "-framework Cocoa")
list(APPEND WebKitTestRunner_SOURCES
- ${WEBKIT_TESTRUNNER_DIR}/cg/TestInvocationCG.cpp
+ ${WebKitTestRunner_DIR}/cocoa/TestControllerCocoa.mm
+ ${WebKitTestRunner_DIR}/cocoa/TestRunnerWKWebView.mm
+ ${WebKitTestRunner_DIR}/cocoa/TestWebsiteDataStoreDelegate.mm
+ ${WebKitTestRunner_DIR}/cocoa/UIScriptControllerCocoa.mm
- ${WEBKIT_TESTRUNNER_DIR}/cocoa/CrashReporterInfo.mm
- ${WEBKIT_TESTRUNNER_DIR}/cocoa/TestControllerCocoa.mm
- ${WEBKIT_TESTRUNNER_DIR}/cocoa/TestRunnerWKWebView.mm
- ${WEBKIT_TESTRUNNER_DIR}/cocoa/TestWebsiteDataStoreDelegate.mm
- ${WEBKIT_TESTRUNNER_DIR}/cocoa/UIScriptControllerCocoa.mm
-
- ${WEBKIT_TESTRUNNER_DIR}/mac/EventSenderProxy.mm
- ${WEBKIT_TESTRUNNER_DIR}/mac/PlatformWebViewMac.mm
- ${WEBKIT_TESTRUNNER_DIR}/mac/PoseAsClass.mm
- ${WEBKIT_TESTRUNNER_DIR}/mac/TestControllerMac.mm
- ${WEBKIT_TESTRUNNER_DIR}/mac/UIScriptControllerMac.mm
- ${WEBKIT_TESTRUNNER_DIR}/mac/WebKitTestRunnerDraggingInfo.mm
- ${WEBKIT_TESTRUNNER_DIR}/mac/WebKitTestRunnerEvent.mm
- ${WEBKIT_TESTRUNNER_DIR}/mac/WebKitTestRunnerPasteboard.mm
- ${WEBKIT_TESTRUNNER_DIR}/mac/WebKitTestRunnerWindow.mm
- ${WEBKIT_TESTRUNNER_DIR}/mac/main.mm
+ ${WebKitTestRunner_DIR}/mac/EventSenderProxy.mm
+ ${WebKitTestRunner_DIR}/mac/PlatformWebViewMac.mm
+ ${WebKitTestRunner_DIR}/mac/PoseAsClass.mm
+ ${WebKitTestRunner_DIR}/mac/TestControllerMac.mm
+ ${WebKitTestRunner_DIR}/mac/UIScriptControllerMac.mm
+ ${WebKitTestRunner_DIR}/mac/WebKitTestRunnerDraggingInfo.mm
+ ${WebKitTestRunner_DIR}/mac/WebKitTestRunnerEvent.mm
+ ${WebKitTestRunner_DIR}/mac/WebKitTestRunnerPasteboard.mm
+ ${WebKitTestRunner_DIR}/mac/WebKitTestRunnerWindow.mm
+ ${WebKitTestRunner_DIR}/mac/main.mm
- ${WEBKIT_TESTRUNNER_SHARED_DIR}/cocoa/ClassMethodSwizzler.mm
- ${WEBKIT_TESTRUNNER_SHARED_DIR}/cocoa/PlatformViewHelpers.mm
+ ${WebKitTestRunner_SHARED_DIR}/cocoa/ClassMethodSwizzler.mm
+ ${WebKitTestRunner_SHARED_DIR}/cocoa/PlatformViewHelpers.mm
- ${WEBKIT_TESTRUNNER_SHARED_DIR}/EventSerialization/mac/EventSerializerMac.mm
- ${WEBKIT_TESTRUNNER_SHARED_DIR}/EventSerialization/mac/SharedEventStreamsMac.mm
+ ${WebKitTestRunner_SHARED_DIR}/EventSerialization/mac/EventSerializerMac.mm
+ ${WebKitTestRunner_SHARED_DIR}/EventSerialization/mac/SharedEventStreamsMac.mm
)
link_directories(../../WebKitLibraries)
