<!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>[210980] trunk/Source/WebKit2</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/210980">210980</a></dd>
<dt>Author</dt> <dd>achristensen@apple.com</dd>
<dt>Date</dt> <dd>2017-01-20 13:50:26 -0800 (Fri, 20 Jan 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix Mac CMake build.
* CMakeLists.txt:
* PlatformMac.cmake:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2CMakeListstxt">trunk/Source/WebKit2/CMakeLists.txt</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2PlatformMaccmake">trunk/Source/WebKit2/PlatformMac.cmake</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2CMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/CMakeLists.txt (210979 => 210980)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/CMakeLists.txt 2017-01-20 21:35:09 UTC (rev 210979)
+++ trunk/Source/WebKit2/CMakeLists.txt 2017-01-20 21:50:26 UTC (rev 210980)
</span><span class="lines">@@ -722,6 +722,9 @@
</span><span class="cx"> endif ()
</span><span class="cx"> endmacro()
</span><span class="cx">
</span><ins>+set(WebKit2_AUTOMATION_PROTOCOL_GENERATOR_EXTRA_FLAGS
+)
+
</ins><span class="cx"> WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
</span><span class="cx">
</span><span class="cx"> GENERATE_WEBKIT2_MESSAGE_SOURCES(WebKit2_DERIVED_SOURCES "${WebKit2_MESSAGES_IN_FILES}")
</span><span class="lines">@@ -747,7 +750,7 @@
</span><span class="cx"> OUTPUT ${DERIVED_SOURCES_WEBKIT2_DIR}/AutomationBackendDispatchers.h ${DERIVED_SOURCES_WEBKIT2_DIR}/AutomationBackendDispatchers.cpp ${DERIVED_SOURCES_WEBKIT2_DIR}/AutomationProtocolObjects.h ${DERIVED_SOURCES_WEBKIT2_DIR}/AutomationProtocolObjects.cpp
</span><span class="cx"> MAIN_DEPENDENCY ${WebKit2_AUTOMATION_PROTOCOL_GENERATOR_INPUTS}
</span><span class="cx"> DEPENDS ${WebKit2_AUTOMATION_PROTOCOL_GENERATOR_SCRIPTS}
</span><del>- COMMAND ${PYTHON_EXECUTABLE} ${PROTOCOL_GENERATOR_SCRIPTS_DIR}/generate-inspector-protocol-bindings.py --outputDir "${DERIVED_SOURCES_WEBKIT2_DIR}" --framework WebKit --backend ${WebKit2_AUTOMATION_PROTOCOL_GENERATOR_INPUTS}
</del><ins>+ COMMAND ${PYTHON_EXECUTABLE} ${PROTOCOL_GENERATOR_SCRIPTS_DIR}/generate-inspector-protocol-bindings.py --outputDir "${DERIVED_SOURCES_WEBKIT2_DIR}" --framework WebKit ${WebKit2_AUTOMATION_PROTOCOL_GENERATOR_EXTRA_FLAGS} --backend ${WebKit2_AUTOMATION_PROTOCOL_GENERATOR_INPUTS}
</ins><span class="cx"> VERBATIM)
</span><span class="cx">
</span><span class="cx"> list(APPEND WebKit2_HEADERS
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (210979 => 210980)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2017-01-20 21:35:09 UTC (rev 210979)
+++ trunk/Source/WebKit2/ChangeLog 2017-01-20 21:50:26 UTC (rev 210980)
</span><span class="lines">@@ -1,3 +1,10 @@
</span><ins>+2017-01-20 Alex Christensen <achristensen@webkit.org>
+
+ Fix Mac CMake build.
+
+ * CMakeLists.txt:
+ * PlatformMac.cmake:
+
</ins><span class="cx"> 2017-01-20 Antoine Quint <graouts@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Animations should be off by default and enabled as an experimental feature
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformMaccmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/PlatformMac.cmake (210979 => 210980)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/PlatformMac.cmake 2017-01-20 21:35:09 UTC (rev 210979)
+++ trunk/Source/WebKit2/PlatformMac.cmake 2017-01-20 21:50:26 UTC (rev 210980)
</span><span class="lines">@@ -157,11 +157,16 @@
</span><span class="cx"> Shared/mac/WebMemorySampler.mac.mm
</span><span class="cx">
</span><span class="cx"> UIProcess/HighPerformanceGraphicsUsageSampler.cpp
</span><ins>+ UIProcess/PerActivityStateCPUUsageSampler.cpp
</ins><span class="cx"> UIProcess/WebContextMenuListenerProxy.cpp
</span><span class="cx"> UIProcess/WebResourceLoadStatisticsStore.cpp
</span><span class="cx">
</span><span class="cx"> UIProcess/Automation/WebAutomationSession.cpp
</span><span class="cx">
</span><ins>+ UIProcess/Automation/cocoa/WebAutomationSessionCocoa.mm
+
+ UIProcess/Automation/mac/WebAutomationSessionMac.mm
+
</ins><span class="cx"> UIProcess/API/APIUserScript.cpp
</span><span class="cx"> UIProcess/API/APIUserStyleSheet.cpp
</span><span class="cx"> UIProcess/API/APIWebsiteDataRecord.cpp
</span><span class="lines">@@ -243,7 +248,6 @@
</span><span class="cx"> UIProcess/Cocoa/ViewGestureController.cpp
</span><span class="cx"> UIProcess/Cocoa/WKReloadFrameErrorRecoveryAttempter.mm
</span><span class="cx"> UIProcess/Cocoa/WKWebViewContentProviderRegistry.mm
</span><del>- UIProcess/Cocoa/WebAutomationSessionCocoa.mm
</del><span class="cx"> UIProcess/Cocoa/WebPageProxyCocoa.mm
</span><span class="cx"> UIProcess/Cocoa/WebPasteboardProxyCocoa.mm
</span><span class="cx"> UIProcess/Cocoa/WebProcessPoolCocoa.mm
</span><span class="lines">@@ -712,6 +716,10 @@
</span><span class="cx"> file(WRITE ${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebKit/${_file} "#import <WebKitLegacy/${_file}>")
</span><span class="cx"> endforeach ()
</span><span class="cx">
</span><ins>+list(APPEND WebKit2_AUTOMATION_PROTOCOL_GENERATOR_EXTRA_FLAGS
+ --platform=macOS
+)
+
</ins><span class="cx"> # FIXME: These should not be necessary.
</span><span class="cx"> file(WRITE ${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebKit/WKImageCG.h "#import <WebKit2/Shared/API/c/cg/WKImageCG.h>")
</span><span class="cx"> file(WRITE ${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebKit/WebStorageManagerPrivate.h "#import <WebKit/mac/Storage/WebStorageManagerPrivate.h>")
</span></span></pre>
</div>
</div>
</body>
</html>