<!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>[225290] 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/225290">225290</a></dd>
<dt>Author</dt> <dd>achristensen@apple.com</dd>
<dt>Date</dt> <dd>2017-11-29 13:31:07 -0800 (Wed, 29 Nov 2017)</dd>
</dl>

<h3>Log Message</h3>
<pre>Fix Mac CMake build.

.:

* Source/cmake/OptionsMac.cmake:

Source/JavaScriptCore:

* PlatformMac.cmake:

Source/WebCore:

* PlatformMac.cmake:

Source/WebCore/PAL:

* pal/PlatformMac.cmake:

Source/WebKit:

* PlatformMac.cmake:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkChangeLog">trunk/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCorePlatformMaccmake">trunk/Source/JavaScriptCore/PlatformMac.cmake</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorePALChangeLog">trunk/Source/WebCore/PAL/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorePALpalPlatformMaccmake">trunk/Source/WebCore/PAL/pal/PlatformMac.cmake</a></li>
<li><a href="#trunkSourceWebCorePlatformMaccmake">trunk/Source/WebCore/PlatformMac.cmake</a></li>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitPlatformMaccmake">trunk/Source/WebKit/PlatformMac.cmake</a></li>
<li><a href="#trunkSourcecmakeOptionsMaccmake">trunk/Source/cmake/OptionsMac.cmake</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/ChangeLog (225289 => 225290)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ChangeLog  2017-11-29 21:11:04 UTC (rev 225289)
+++ trunk/ChangeLog     2017-11-29 21:31:07 UTC (rev 225290)
</span><span class="lines">@@ -1,3 +1,9 @@
</span><ins>+2017-11-29  Alex Christensen  <achristensen@webkit.org>
+
+        Fix Mac CMake build.
+
+        * Source/cmake/OptionsMac.cmake:
+
</ins><span class="cx"> 2017-11-28  Michael Catanzaro  <mcatanzaro@igalia.com>
</span><span class="cx"> 
</span><span class="cx">         REGRESSION(r225098): [WPE] Some features have changed of value (70 new failures)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (225289 => 225290)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog    2017-11-29 21:11:04 UTC (rev 225289)
+++ trunk/Source/JavaScriptCore/ChangeLog       2017-11-29 21:31:07 UTC (rev 225290)
</span><span class="lines">@@ -1,3 +1,9 @@
</span><ins>+2017-11-29  Alex Christensen  <achristensen@webkit.org>
+
+        Fix Mac CMake build.
+
+        * PlatformMac.cmake:
+
</ins><span class="cx"> 2017-11-29  Stanislav Ocovaj  <stanislav.ocovaj@rt-rk.com>
</span><span class="cx"> 
</span><span class="cx">         [MIPS][JSC] Implement MacroAssembler::probe support on MIPS
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorePlatformMaccmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/PlatformMac.cmake (225289 => 225290)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/PlatformMac.cmake    2017-11-29 21:11:04 UTC (rev 225289)
+++ trunk/Source/JavaScriptCore/PlatformMac.cmake       2017-11-29 21:31:07 UTC (rev 225290)
</span><span class="lines">@@ -12,6 +12,7 @@
</span><span class="cx"> list(APPEND JavaScriptCore_INCLUDE_DIRECTORIES
</span><span class="cx">     ${JAVASCRIPTCORE_DIR}/disassembler/udis86
</span><span class="cx">     ${JAVASCRIPTCORE_DIR}/icu
</span><ins>+    ${JAVASCRIPTCORE_DIR}/inspector/cocoa
</ins><span class="cx">     ${JAVASCRIPTCORE_DIR}/inspector/remote/cocoa
</span><span class="cx"> )
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (225289 => 225290)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2017-11-29 21:11:04 UTC (rev 225289)
+++ trunk/Source/WebCore/ChangeLog      2017-11-29 21:31:07 UTC (rev 225290)
</span><span class="lines">@@ -1,3 +1,9 @@
</span><ins>+2017-11-29  Alex Christensen  <achristensen@webkit.org>
+
+        Fix Mac CMake build.
+
+        * PlatformMac.cmake:
+
</ins><span class="cx"> 2017-11-29  Simon Fraser  <simon.fraser@apple.com>
</span><span class="cx"> 
</span><span class="cx">         REGRESSION (r213590): Scrolling to anchors broken in web views when content loaded via HTML string
</span></span></pre></div>
<a id="trunkSourceWebCorePALChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PAL/ChangeLog (225289 => 225290)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PAL/ChangeLog       2017-11-29 21:11:04 UTC (rev 225289)
+++ trunk/Source/WebCore/PAL/ChangeLog  2017-11-29 21:31:07 UTC (rev 225290)
</span><span class="lines">@@ -1,3 +1,9 @@
</span><ins>+2017-11-29  Alex Christensen  <achristensen@webkit.org>
+
+        Fix Mac CMake build.
+
+        * pal/PlatformMac.cmake:
+
</ins><span class="cx"> 2017-11-28  Brent Fulgham  <bfulgham@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Adopt updated NSKeyed[Un]Archiver API when available
</span></span></pre></div>
<a id="trunkSourceWebCorePALpalPlatformMaccmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PAL/pal/PlatformMac.cmake (225289 => 225290)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PAL/pal/PlatformMac.cmake   2017-11-29 21:11:04 UTC (rev 225289)
+++ trunk/Source/WebCore/PAL/pal/PlatformMac.cmake      2017-11-29 21:31:07 UTC (rev 225290)
</span><span class="lines">@@ -3,6 +3,7 @@
</span><span class="cx"> 
</span><span class="cx">     cf/CoreMediaSoftLink.cpp
</span><span class="cx"> 
</span><ins>+    cocoa/FileSizeFormatterCocoa.mm
</ins><span class="cx">     cocoa/LoggingCocoa.mm
</span><span class="cx"> 
</span><span class="cx">     crypto/commoncrypto/CryptoDigestCommonCrypto.cpp
</span><span class="lines">@@ -22,5 +23,6 @@
</span><span class="cx"> list(APPEND PAL_PRIVATE_INCLUDE_DIRECTORIES
</span><span class="cx">     "${PAL_DIR}/pal/cf"
</span><span class="cx">     "${PAL_DIR}/pal/spi/cf"
</span><ins>+    "${PAL_DIR}/pal/spi/cocoa"
</ins><span class="cx">     "${PAL_DIR}/pal/spi/mac"
</span><span class="cx"> )
</span></span></pre></div>
<a id="trunkSourceWebCorePlatformMaccmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PlatformMac.cmake (225289 => 225290)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PlatformMac.cmake   2017-11-29 21:11:04 UTC (rev 225289)
+++ trunk/Source/WebCore/PlatformMac.cmake      2017-11-29 21:31:07 UTC (rev 225290)
</span><span class="lines">@@ -90,6 +90,7 @@
</span><span class="cx">     "${WEBCORE_DIR}/ForwardingHeaders/replay"
</span><span class="cx">     "${WEBCORE_DIR}/ForwardingHeaders/runtime"
</span><span class="cx">     "${WEBCORE_DIR}/ForwardingHeaders/yarr"
</span><ins>+    "${WEBCORE_DIR}/html/shadow/cocoa"
</ins><span class="cx">     "${WEBCORE_DIR}/icu"
</span><span class="cx">     "${WEBCORE_DIR}/loader/archive/cf"
</span><span class="cx">     "${WEBCORE_DIR}/loader/cf"
</span><span class="lines">@@ -293,7 +294,6 @@
</span><span class="cx">     platform/graphics/cg/IOSurfacePool.cpp
</span><span class="cx">     platform/graphics/cg/ImageBufferCG.cpp
</span><span class="cx">     platform/graphics/cg/ImageBufferDataCG.cpp
</span><del>-    platform/graphics/cg/ImageCG.cpp
</del><span class="cx">     platform/graphics/cg/ImageDecoderCG.cpp
</span><span class="cx">     platform/graphics/cg/ImageSourceCGMac.mm
</span><span class="cx">     platform/graphics/cg/IntPointCG.cpp
</span><span class="lines">@@ -470,6 +470,8 @@
</span><span class="cx">     rendering/RenderThemeCocoa.mm
</span><span class="cx">     rendering/RenderThemeMac.mm
</span><span class="cx">     rendering/TextAutoSizing.cpp
</span><ins>+
+    xml/SoftLinkLibxslt.cpp
</ins><span class="cx"> )
</span><span class="cx"> 
</span><span class="cx"> # FIXME: We do not need everything from all of these directories.
</span><span class="lines">@@ -526,6 +528,8 @@
</span><span class="cx">     html/parser
</span><span class="cx">     html/shadow
</span><span class="cx"> 
</span><ins>+    inspector/agents
+
</ins><span class="cx">     loader/appcache
</span><span class="cx">     loader/archive
</span><span class="cx">     loader/cache
</span></span></pre></div>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (225289 => 225290)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog    2017-11-29 21:11:04 UTC (rev 225289)
+++ trunk/Source/WebKit/ChangeLog       2017-11-29 21:31:07 UTC (rev 225290)
</span><span class="lines">@@ -1,3 +1,9 @@
</span><ins>+2017-11-29  Alex Christensen  <achristensen@webkit.org>
+
+        Fix Mac CMake build.
+
+        * PlatformMac.cmake:
+
</ins><span class="cx"> 2017-11-29  Chris Dumez  <cdumez@apple.com>
</span><span class="cx"> 
</span><span class="cx">         StorageToWebProcessConnection & WebSWServerToContextConnection should use the same underlying IPC::Connection
</span></span></pre></div>
<a id="trunkSourceWebKitPlatformMaccmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/PlatformMac.cmake (225289 => 225290)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/PlatformMac.cmake    2017-11-29 21:11:04 UTC (rev 225289)
+++ trunk/Source/WebKit/PlatformMac.cmake       2017-11-29 21:31:07 UTC (rev 225290)
</span><span class="lines">@@ -176,6 +176,7 @@
</span><span class="cx"> 
</span><span class="cx">     UIProcess/Automation/mac/WebAutomationSessionMac.mm
</span><span class="cx"> 
</span><ins>+    UIProcess/API/APIAttachment.cpp
</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">@@ -302,6 +303,7 @@
</span><span class="cx">     UIProcess/mac/WKFullKeyboardAccessWatcher.mm
</span><span class="cx">     UIProcess/mac/WKFullScreenWindowController.mm
</span><span class="cx">     UIProcess/mac/WKImmediateActionController.mm
</span><ins>+    UIProcess/mac/WKInspectorViewController.mm
</ins><span class="cx">     UIProcess/mac/WKPrintingView.mm
</span><span class="cx">     UIProcess/mac/WKSharingServicePickerDelegate.mm
</span><span class="cx">     UIProcess/mac/WKTextFinderClient.mm
</span><span class="lines">@@ -508,6 +510,7 @@
</span><span class="cx">     Shared/API/c/cf
</span><span class="cx">     Shared/API/c/mac
</span><span class="cx"> 
</span><ins>+    UIProcess
</ins><span class="cx">     UIProcess/Cocoa
</span><span class="cx"> 
</span><span class="cx">     UIProcess/API/C
</span><span class="lines">@@ -794,4 +797,4 @@
</span><span class="cx">         ibtool --compile ${WebKit_XPC_SERVICE_DIR}/com.apple.WebKit.WebContent.xpc/Contents/Resources/WebContentProcess.nib ${WEBKIT_DIR}/Resources/WebContentProcess.xib
</span><span class="cx">         VERBATIM)
</span><span class="cx">     add_dependencies(WebKit WebContentProcessNib)
</span><del>-endfunction()
</del><span class="cx">\ No newline at end of file
</span><ins>+endfunction()
</ins></span></pre></div>
<a id="trunkSourcecmakeOptionsMaccmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/OptionsMac.cmake (225289 => 225290)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/OptionsMac.cmake      2017-11-29 21:11:04 UTC (rev 225289)
+++ trunk/Source/cmake/OptionsMac.cmake 2017-11-29 21:31:07 UTC (rev 225290)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx"> # we need a value different from the default defined in WebKitFeatures.cmake.
</span><span class="cx"> # FIXME: Many of these defaults differ from the XCode build.
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ACCELERATED_OVERFLOW_SCROLLING PRIVATE ON)
</span><del>-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ALTERNATIVE_PRESENTATION_BUTTON_ELEMENT ON)
</del><ins>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ALTERNATIVE_PRESENTATION_BUTTON_ELEMENT PRIVATE ON)
</ins><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_API_TESTS PRIVATE ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ATTACHMENT_ELEMENT PRIVATE ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ASYNC_SCROLLING PRIVATE ON)
</span></span></pre>
</div>
</div>

</body>
</html>