<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[199118] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/199118">199118</a></dd>
<dt>Author</dt> <dd>achristensen@apple.com</dd>
<dt>Date</dt> <dd>2016-04-06 14:51:56 -0700 (Wed, 06 Apr 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Compile WebKitTestRunner with CMake on Mac
https://bugs.webkit.org/show_bug.cgi?id=156310
Reviewed by Daniel Bates.
Source/WebKit2:
* PlatformMac.cmake:
Tools:
* CMakeLists.txt:
* WebKitTestRunner/CMakeLists.txt:
* WebKitTestRunner/InjectedBundle/mac/InjectedBundleMac.mm:
* WebKitTestRunner/PlatformEfl.cmake:
* WebKitTestRunner/PlatformGTK.cmake:
* WebKitTestRunner/PlatformMac.cmake: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2PlatformMaccmake">trunk/Source/WebKit2/PlatformMac.cmake</a></li>
<li><a href="#trunkToolsCMakeListstxt">trunk/Tools/CMakeLists.txt</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsWebKitTestRunnerCMakeListstxt">trunk/Tools/WebKitTestRunner/CMakeLists.txt</a></li>
<li><a href="#trunkToolsWebKitTestRunnerInjectedBundlemacInjectedBundleMacmm">trunk/Tools/WebKitTestRunner/InjectedBundle/mac/InjectedBundleMac.mm</a></li>
<li><a href="#trunkToolsWebKitTestRunnerPlatformEflcmake">trunk/Tools/WebKitTestRunner/PlatformEfl.cmake</a></li>
<li><a href="#trunkToolsWebKitTestRunnerPlatformGTKcmake">trunk/Tools/WebKitTestRunner/PlatformGTK.cmake</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkToolsWebKitTestRunnerPlatformMaccmake">trunk/Tools/WebKitTestRunner/PlatformMac.cmake</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (199117 => 199118)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2016-04-06 Alex Christensen <achristensen@webkit.org>
+
+ Compile WebKitTestRunner with CMake on Mac
+ https://bugs.webkit.org/show_bug.cgi?id=156310
+
+ Reviewed by Daniel Bates.
+
+ * PlatformMac.cmake:
+
</ins><span class="cx"> 2016-04-05 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Rename exposedRect to viewExposedRect and propagate it as Optional<> through WK2
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformMaccmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/PlatformMac.cmake (199117 => 199118)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -159,6 +159,9 @@
</span><span class="cx"> UIProcess/API/APIUserStyleSheet.cpp
</span><span class="cx"> UIProcess/API/APIWebsiteDataRecord.cpp
</span><span class="cx">
</span><ins>+ UIProcess/API/C/mac/WKContextPrivateMac.mm
+ UIProcess/API/C/mac/WKPagePrivateMac.mm
+
</ins><span class="cx"> UIProcess/API/Cocoa/APISerializedScriptValueCocoa.mm
</span><span class="cx"> UIProcess/API/Cocoa/APIUserContentExtensionStoreCocoa.mm
</span><span class="cx"> UIProcess/API/Cocoa/APIWebsiteDataStoreCocoa.mm
</span><span class="lines">@@ -492,6 +495,8 @@
</span><span class="cx"> UIProcess/Cocoa
</span><span class="cx">
</span><span class="cx"> UIProcess/API/C
</span><ins>+
+ UIProcess/API/C/mac
</ins><span class="cx"> UIProcess/API/cpp
</span><span class="cx">
</span><span class="cx"> WebProcess/WebPage
</span><span class="lines">@@ -515,6 +520,8 @@
</span><span class="cx">
</span><span class="cx"> # FIXME: Forwarding headers should be complete copies of the header.
</span><span class="cx"> set(WebKitLegacyForwardingHeaders
</span><ins>+ DOM.h
+ DOMCore.h
</ins><span class="cx"> DOMElement.h
</span><span class="cx"> DOMException.h
</span><span class="cx"> DOMObject.h
</span><span class="lines">@@ -522,6 +529,7 @@
</span><span class="cx"> WebApplicationCache.h
</span><span class="cx"> WebCache.h
</span><span class="cx"> WebCoreStatistics.h
</span><ins>+ WebDOMOperations.h
</ins><span class="cx"> WebDOMOperationsPrivate.h
</span><span class="cx"> WebDataSource.h
</span><span class="cx"> WebDataSourcePrivate.h
</span><span class="lines">@@ -714,6 +722,7 @@
</span><span class="cx"> endforeach ()
</span><span class="cx">
</span><span class="cx"> # FIXME: These should not be necessary.
</span><ins>+file(WRITE ${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebKit/WKImageCG.h "#import <WebKit2/Shared/API/c/cg/WKImageCG.h>")
</ins><span class="cx"> file(WRITE ${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebKit/WebStorageManagerPrivate.h "#import <WebKit/mac/Storage/WebStorageManagerPrivate.h>")
</span><span class="cx"> file(WRITE ${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebKit/WebDatabaseManagerPrivate.h "#import <WebKit/mac/Storage/WebDatabaseManagerPrivate.h>")
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Tools/CMakeLists.txt (199117 => 199118)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -35,6 +35,7 @@
</span><span class="cx">
</span><span class="cx"> if (APPLE)
</span><span class="cx"> add_subdirectory(DumpRenderTree)
</span><ins>+ add_subdirectory(WebKitTestRunner)
</ins><span class="cx"> endif ()
</span><span class="cx">
</span><span class="cx"> if (ENABLE_WEBKIT2 AND ENABLE_API_TESTS)
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (199117 => 199118)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-04-06 21:48:21 UTC (rev 199117)
+++ trunk/Tools/ChangeLog 2016-04-06 21:51:56 UTC (rev 199118)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2016-04-06 Alex Christensen <achristensen@webkit.org>
+
+ 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.
+
</ins><span class="cx"> 2016-04-05 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Implement operator== and operator!= for Optional<>
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/CMakeLists.txt (199117 => 199118)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -23,7 +23,6 @@
</span><span class="cx">
</span><span class="cx"> set(WebKitTestRunner_LIBRARIES
</span><span class="cx"> JavaScriptCore
</span><del>- WebCore
</del><span class="cx"> WebCoreTestSupport
</span><span class="cx"> WebKit2
</span><span class="cx"> )
</span><span class="lines">@@ -124,4 +123,6 @@
</span><span class="cx"> add_executable(WebKitTestRunner ${WebKitTestRunner_SOURCES})
</span><span class="cx"> target_link_libraries(WebKitTestRunner ${WebKitTestRunner_LIBRARIES})
</span><span class="cx">
</span><del>-add_dependencies(WebKit2 ${ForwardingHeadersForWebKitTestRunner_NAME})
</del><ins>+if (NOT APPLE)
+ add_dependencies(WebKit2 ${ForwardingHeadersForWebKitTestRunner_NAME})
+endif ()
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundlemacInjectedBundleMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/mac/InjectedBundleMac.mm (199117 => 199118)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -23,6 +23,7 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><ins>+#import "config.h"
</ins><span class="cx"> #import "InjectedBundle.h"
</span><span class="cx">
</span><span class="cx"> #import <Foundation/Foundation.h>
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerPlatformEflcmake"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/PlatformEfl.cmake (199117 => 199118)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -26,6 +26,7 @@
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> list(APPEND WebKitTestRunner_LIBRARIES
</span><ins>+ WebCore
</ins><span class="cx"> ${CAIRO_LIBRARIES}
</span><span class="cx"> ${ECORE_LIBRARIES}
</span><span class="cx"> ${ECORE_EVAS_LIBRARIES}
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerPlatformGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/PlatformGTK.cmake (199117 => 199118)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -31,6 +31,7 @@
</span><span class="cx"> ${GTK3_LIBRARIES}
</span><span class="cx"> ${GLIB_LIBRARIES}
</span><span class="cx"> WTF
</span><ins>+ WebCore
</ins><span class="cx"> WebCorePlatformGTK
</span><span class="cx"> )
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerPlatformMaccmake"></a>
<div class="addfile"><h4>Added: trunk/Tools/WebKitTestRunner/PlatformMac.cmake (0 => 199118)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/PlatformMac.cmake (rev 0)
+++ trunk/Tools/WebKitTestRunner/PlatformMac.cmake 2016-04-06 21:51:56 UTC (rev 199118)
</span><span class="lines">@@ -0,0 +1,71 @@
</span><ins>+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/JavaScriptCore
+ ${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)
</ins></span></pre>
</div>
</div>
</body>
</html>