Diff
Modified: trunk/Source/WebKit2/ChangeLog (199117 => 199118)
--- trunk/Source/WebKit2/ChangeLog 2016-04-06 21:48:21 UTC (rev 199117)
+++ trunk/Source/WebKit2/ChangeLog 2016-04-06 21:51:56 UTC (rev 199118)
@@ -1,3 +1,12 @@
+2016-04-06 Alex Christensen <[email protected]>
+
+ Compile WebKitTestRunner with CMake on Mac
+ https://bugs.webkit.org/show_bug.cgi?id=156310
+
+ Reviewed by Daniel Bates.
+
+ * PlatformMac.cmake:
+
2016-04-05 Simon Fraser <[email protected]>
Rename exposedRect to viewExposedRect and propagate it as Optional<> through WK2
Modified: trunk/Source/WebKit2/PlatformMac.cmake (199117 => 199118)
--- trunk/Source/WebKit2/PlatformMac.cmake 2016-04-06 21:48:21 UTC (rev 199117)
+++ trunk/Source/WebKit2/PlatformMac.cmake 2016-04-06 21:51:56 UTC (rev 199118)
@@ -159,6 +159,9 @@
UIProcess/API/APIUserStyleSheet.cpp
UIProcess/API/APIWebsiteDataRecord.cpp
+ UIProcess/API/C/mac/WKContextPrivateMac.mm
+ UIProcess/API/C/mac/WKPagePrivateMac.mm
+
UIProcess/API/Cocoa/APISerializedScriptValueCocoa.mm
UIProcess/API/Cocoa/APIUserContentExtensionStoreCocoa.mm
UIProcess/API/Cocoa/APIWebsiteDataStoreCocoa.mm
@@ -492,6 +495,8 @@
UIProcess/Cocoa
UIProcess/API/C
+
+ UIProcess/API/C/mac
UIProcess/API/cpp
WebProcess/WebPage
@@ -515,6 +520,8 @@
# FIXME: Forwarding headers should be complete copies of the header.
set(WebKitLegacyForwardingHeaders
+ DOM.h
+ DOMCore.h
DOMElement.h
DOMException.h
DOMObject.h
@@ -522,6 +529,7 @@
WebApplicationCache.h
WebCache.h
WebCoreStatistics.h
+ WebDOMOperations.h
WebDOMOperationsPrivate.h
WebDataSource.h
WebDataSourcePrivate.h
@@ -714,6 +722,7 @@
endforeach ()
# FIXME: These should not be necessary.
+file(WRITE ${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebKit/WKImageCG.h "#import <WebKit2/Shared/API/c/cg/WKImageCG.h>")
file(WRITE ${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebKit/WebStorageManagerPrivate.h "#import <WebKit/mac/Storage/WebStorageManagerPrivate.h>")
file(WRITE ${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebKit/WebDatabaseManagerPrivate.h "#import <WebKit/mac/Storage/WebDatabaseManagerPrivate.h>")
Modified: trunk/Tools/CMakeLists.txt (199117 => 199118)
--- trunk/Tools/CMakeLists.txt 2016-04-06 21:48:21 UTC (rev 199117)
+++ trunk/Tools/CMakeLists.txt 2016-04-06 21:51:56 UTC (rev 199118)
@@ -35,6 +35,7 @@
if (APPLE)
add_subdirectory(DumpRenderTree)
+ add_subdirectory(WebKitTestRunner)
endif ()
if (ENABLE_WEBKIT2 AND ENABLE_API_TESTS)
Modified: trunk/Tools/ChangeLog (199117 => 199118)
--- trunk/Tools/ChangeLog 2016-04-06 21:48:21 UTC (rev 199117)
+++ trunk/Tools/ChangeLog 2016-04-06 21:51:56 UTC (rev 199118)
@@ -1,3 +1,17 @@
+2016-04-06 Alex Christensen <[email protected]>
+
+ Compile WebKitTestRunner with CMake on Mac
+ https://bugs.webkit.org/show_bug.cgi?id=156310
+
+ Reviewed by Daniel Bates.
+
+ * CMakeLists.txt:
+ * WebKitTestRunner/CMakeLists.txt:
+ * WebKitTestRunner/InjectedBundle/mac/InjectedBundleMac.mm:
+ * WebKitTestRunner/PlatformEfl.cmake:
+ * WebKitTestRunner/PlatformGTK.cmake:
+ * WebKitTestRunner/PlatformMac.cmake: Added.
+
2016-04-05 Simon Fraser <[email protected]>
Implement operator== and operator!= for Optional<>
Modified: trunk/Tools/WebKitTestRunner/CMakeLists.txt (199117 => 199118)
--- trunk/Tools/WebKitTestRunner/CMakeLists.txt 2016-04-06 21:48:21 UTC (rev 199117)
+++ trunk/Tools/WebKitTestRunner/CMakeLists.txt 2016-04-06 21:51:56 UTC (rev 199118)
@@ -23,7 +23,6 @@
set(WebKitTestRunner_LIBRARIES
_javascript_Core
- WebCore
WebCoreTestSupport
WebKit2
)
@@ -124,4 +123,6 @@
add_executable(WebKitTestRunner ${WebKitTestRunner_SOURCES})
target_link_libraries(WebKitTestRunner ${WebKitTestRunner_LIBRARIES})
-add_dependencies(WebKit2 ${ForwardingHeadersForWebKitTestRunner_NAME})
+if (NOT APPLE)
+ add_dependencies(WebKit2 ${ForwardingHeadersForWebKitTestRunner_NAME})
+endif ()
\ No newline at end of file
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/mac/InjectedBundleMac.mm (199117 => 199118)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/mac/InjectedBundleMac.mm 2016-04-06 21:48:21 UTC (rev 199117)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/mac/InjectedBundleMac.mm 2016-04-06 21:51:56 UTC (rev 199118)
@@ -23,6 +23,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
+#import "config.h"
#import "InjectedBundle.h"
#import <Foundation/Foundation.h>
Modified: trunk/Tools/WebKitTestRunner/PlatformEfl.cmake (199117 => 199118)
--- trunk/Tools/WebKitTestRunner/PlatformEfl.cmake 2016-04-06 21:48:21 UTC (rev 199117)
+++ trunk/Tools/WebKitTestRunner/PlatformEfl.cmake 2016-04-06 21:51:56 UTC (rev 199118)
@@ -26,6 +26,7 @@
)
list(APPEND WebKitTestRunner_LIBRARIES
+ WebCore
${CAIRO_LIBRARIES}
${ECORE_LIBRARIES}
${ECORE_EVAS_LIBRARIES}
Modified: trunk/Tools/WebKitTestRunner/PlatformGTK.cmake (199117 => 199118)
--- trunk/Tools/WebKitTestRunner/PlatformGTK.cmake 2016-04-06 21:48:21 UTC (rev 199117)
+++ trunk/Tools/WebKitTestRunner/PlatformGTK.cmake 2016-04-06 21:51:56 UTC (rev 199118)
@@ -31,6 +31,7 @@
${GTK3_LIBRARIES}
${GLIB_LIBRARIES}
WTF
+ WebCore
WebCorePlatformGTK
)
Added: trunk/Tools/WebKitTestRunner/PlatformMac.cmake (0 => 199118)
--- trunk/Tools/WebKitTestRunner/PlatformMac.cmake (rev 0)
+++ trunk/Tools/WebKitTestRunner/PlatformMac.cmake 2016-04-06 21:51:56 UTC (rev 199118)
@@ -0,0 +1,71 @@
+find_library(CARBON_LIBRARY Carbon)
+
+find_library(CORESERVICES_LIBRARY CoreServices)
+add_definitions(-iframework ${CORESERVICES_LIBRARY}/Versions/Current/Frameworks)
+
+if ("${CURRENT_OSX_VERSION}" MATCHES "10.9")
+set(WEBKITSYSTEMINTERFACE_LIBRARY libWebKitSystemInterfaceMavericks.a)
+elif ("${CURRENT_OSX_VERSION}" MATCHES "10.10")
+set(WEBKITSYSTEMINTERFACE_LIBRARY libWebKitSystemInterfaceYosemite.a)
+else ()
+set(WEBKITSYSTEMINTERFACE_LIBRARY libWebKitSystemInterfaceElCapitan.a)
+endif ()
+link_directories(../../WebKitLibraries)
+
+list(APPEND WebKitTestRunner_LIBRARIES
+ ${CARBON_LIBRARY}
+ ${WEBKITSYSTEMINTERFACE_LIBRARY}
+)
+
+list(APPEND WebKitTestRunner_INCLUDE_DIRECTORIES
+ ${DERIVED_SOURCES_DIR}
+ ${DERIVED_SOURCES_DIR}/WebCore
+ ${DERIVED_SOURCES_DIR}/ForwardingHeaders
+ ${DERIVED_SOURCES_DIR}/ForwardingHeaders/_javascript_Core
+ ${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebCore
+ ${WEBKIT_TESTRUNNER_DIR}/cf
+ ${WEBKIT_TESTRUNNER_DIR}/cg
+ ${WEBKIT_TESTRUNNER_DIR}/cocoa
+ ${WEBKIT_TESTRUNNER_DIR}/mac
+ ${WEBKIT_TESTRUNNER_INJECTEDBUNDLE_DIR}/mac
+ ${WTF_DIR}/icu
+ ${CMAKE_SOURCE_DIR}/WebKitLibraries
+)
+
+list(APPEND WebKitTestRunnerInjectedBundle_SOURCES
+ ${WEBKIT_TESTRUNNER_DIR}/mac/WebArchiveDumpSupportMac.mm
+ ${WEBKIT_TESTRUNNER_DIR}/cocoa/CrashReporterInfo.mm
+ ${WEBKIT_TESTRUNNER_DIR}/cf/WebArchiveDumpSupport.cpp
+
+ ${WEBKIT_TESTRUNNER_INJECTEDBUNDLE_DIR}/cocoa/ActivateFontsCocoa.mm
+ ${WEBKIT_TESTRUNNER_INJECTEDBUNDLE_DIR}/cocoa/InjectedBundlePageCocoa.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
+)
+
+list(APPEND WebKitTestRunner_SOURCES
+ ${WEBKIT_TESTRUNNER_DIR}/cg/TestInvocationCG.cpp
+
+ ${WEBKIT_TESTRUNNER_DIR}/cocoa/CrashReporterInfo.mm
+ ${WEBKIT_TESTRUNNER_DIR}/cocoa/TestControllerCocoa.mm
+ ${WEBKIT_TESTRUNNER_DIR}/cocoa/TestRunnerWKWebView.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/main.mm
+)
+
+link_directories(../../WebKitLibraries)
