<!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>[190255] 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/190255">190255</a></dd>
<dt>Author</dt> <dd>achristensen@apple.com</dd>
<dt>Date</dt> <dd>2015-09-25 15:04:32 -0700 (Fri, 25 Sep 2015)</dd>
</dl>

<h3>Log Message</h3>
<pre>Clean up CMake build on Mac
https://bugs.webkit.org/show_bug.cgi?id=149573

Reviewed by Chris Dumez.

.:

* Source/cmake/OptionsMac.cmake:

Source/WebCore:

* CMakeLists.txt:
* PlatformEfl.cmake:
* PlatformGTK.cmake:
* PlatformMac.cmake:
* platform/graphics/DisplayRefreshMonitor.cpp:

Source/WebKit:

* PlatformMac.cmake:

Source/WTF:

* wtf/PlatformMac.cmake:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkChangeLog">trunk/ChangeLog</a></li>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfPlatformMaccmake">trunk/Source/WTF/wtf/PlatformMac.cmake</a></li>
<li><a href="#trunkSourceWebCoreCMakeListstxt">trunk/Source/WebCore/CMakeLists.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorePlatformEflcmake">trunk/Source/WebCore/PlatformEfl.cmake</a></li>
<li><a href="#trunkSourceWebCorePlatformGTKcmake">trunk/Source/WebCore/PlatformGTK.cmake</a></li>
<li><a href="#trunkSourceWebCorePlatformMaccmake">trunk/Source/WebCore/PlatformMac.cmake</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsDisplayRefreshMonitorcpp">trunk/Source/WebCore/platform/graphics/DisplayRefreshMonitor.cpp</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 (190254 => 190255)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ChangeLog        2015-09-25 22:01:21 UTC (rev 190254)
+++ trunk/ChangeLog        2015-09-25 22:04:32 UTC (rev 190255)
</span><span class="lines">@@ -1,5 +1,14 @@
</span><span class="cx"> 2015-09-25  Alex Christensen  &lt;achristensen@webkit.org&gt;
</span><span class="cx"> 
</span><ins>+        Clean up CMake build on Mac
+        https://bugs.webkit.org/show_bug.cgi?id=149573
+
+        Reviewed by Chris Dumez.
+
+        * Source/cmake/OptionsMac.cmake:
+
+2015-09-25  Alex Christensen  &lt;achristensen@webkit.org&gt;
+
</ins><span class="cx">         [Win] Switch to CMake
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=148111
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (190254 => 190255)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog        2015-09-25 22:01:21 UTC (rev 190254)
+++ trunk/Source/WTF/ChangeLog        2015-09-25 22:04:32 UTC (rev 190255)
</span><span class="lines">@@ -1,5 +1,14 @@
</span><span class="cx"> 2015-09-25  Alex Christensen  &lt;achristensen@webkit.org&gt;
</span><span class="cx"> 
</span><ins>+        Clean up CMake build on Mac
+        https://bugs.webkit.org/show_bug.cgi?id=149573
+
+        Reviewed by Chris Dumez.
+
+        * wtf/PlatformMac.cmake:
+
+2015-09-25  Alex Christensen  &lt;achristensen@webkit.org&gt;
+
</ins><span class="cx">         [Win] Switch to CMake
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=148111
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWTFwtfPlatformMaccmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/PlatformMac.cmake (190254 => 190255)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/PlatformMac.cmake        2015-09-25 22:01:21 UTC (rev 190254)
+++ trunk/Source/WTF/wtf/PlatformMac.cmake        2015-09-25 22:04:32 UTC (rev 190255)
</span><span class="lines">@@ -23,4 +23,5 @@
</span><span class="cx"> 
</span><span class="cx"> list(APPEND WTF_INCLUDE_DIRECTORIES
</span><span class="cx">     &quot;${WTF_DIR}/icu&quot;
</span><ins>+    &quot;${WTF_DIR}/wtf/spi/darwin&quot;
</ins><span class="cx"> )
</span></span></pre></div>
<a id="trunkSourceWebCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/CMakeLists.txt (190254 => 190255)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/CMakeLists.txt        2015-09-25 22:01:21 UTC (rev 190254)
+++ trunk/Source/WebCore/CMakeLists.txt        2015-09-25 22:04:32 UTC (rev 190255)
</span><span class="lines">@@ -2913,12 +2913,6 @@
</span><span class="cx">     ${WEBCORE_DIR}/css/SVGCSSValueKeywords.in
</span><span class="cx"> )
</span><span class="cx"> 
</span><del>-if (ENABLE_SMOOTH_SCROLLING)
-    list(APPEND WebCore_SOURCES
-        platform/ScrollAnimatorNone.cpp
-    )
-endif ()
-
</del><span class="cx"> if (ENABLE_WEBGL)
</span><span class="cx">     list(APPEND WebCore_SOURCES
</span><span class="cx">         html/canvas/ANGLEInstancedArrays.cpp
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (190254 => 190255)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2015-09-25 22:01:21 UTC (rev 190254)
+++ trunk/Source/WebCore/ChangeLog        2015-09-25 22:04:32 UTC (rev 190255)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2015-09-25  Alex Christensen  &lt;achristensen@webkit.org&gt;
+
+        Clean up CMake build on Mac
+        https://bugs.webkit.org/show_bug.cgi?id=149573
+
+        Reviewed by Chris Dumez.
+
+        * CMakeLists.txt:
+        * PlatformEfl.cmake:
+        * PlatformGTK.cmake:
+        * PlatformMac.cmake:
+        * platform/graphics/DisplayRefreshMonitor.cpp:
+
</ins><span class="cx"> 2015-09-25  Tim Horton  &lt;timothy_horton@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Scrolling a overflow: scroll region makes find overlay holes stick to the edge of the region
</span></span></pre></div>
<a id="trunkSourceWebCorePlatformEflcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PlatformEfl.cmake (190254 => 190255)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PlatformEfl.cmake        2015-09-25 22:01:21 UTC (rev 190254)
+++ trunk/Source/WebCore/PlatformEfl.cmake        2015-09-25 22:04:32 UTC (rev 190255)
</span><span class="lines">@@ -513,6 +513,12 @@
</span><span class="cx">     )
</span><span class="cx"> endif ()
</span><span class="cx"> 
</span><ins>+if (ENABLE_SMOOTH_SCROLLING)
+    list(APPEND WebCore_SOURCES
+        platform/ScrollAnimatorNone.cpp
+    )
+endif ()
+
</ins><span class="cx"> if (ENABLE_SPEECH_SYNTHESIS)
</span><span class="cx">     list(APPEND WebCore_SYSTEM_INCLUDE_DIRECTORIES
</span><span class="cx">         ${ESPEAK_INCLUDE_DIRS}
</span></span></pre></div>
<a id="trunkSourceWebCorePlatformGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PlatformGTK.cmake (190254 => 190255)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PlatformGTK.cmake        2015-09-25 22:01:21 UTC (rev 190254)
+++ trunk/Source/WebCore/PlatformGTK.cmake        2015-09-25 22:04:32 UTC (rev 190255)
</span><span class="lines">@@ -909,6 +909,12 @@
</span><span class="cx"> # Propagate this variable to the parent scope, so that it can be used in other parts of the build.
</span><span class="cx"> set(GObjectDOMBindings_GIR_HEADERS ${GObjectDOMBindings_GIR_HEADERS} PARENT_SCOPE)
</span><span class="cx"> 
</span><ins>+if (ENABLE_SMOOTH_SCROLLING)
+    list(APPEND WebCore_SOURCES
+        platform/ScrollAnimatorNone.cpp
+    )
+endif ()
+
</ins><span class="cx"> if (ENABLE_SUBTLE_CRYPTO)
</span><span class="cx">     list(APPEND WebCore_SOURCES
</span><span class="cx">         crypto/CryptoAlgorithm.cpp
</span></span></pre></div>
<a id="trunkSourceWebCorePlatformMaccmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PlatformMac.cmake (190254 => 190255)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PlatformMac.cmake        2015-09-25 22:01:21 UTC (rev 190254)
+++ trunk/Source/WebCore/PlatformMac.cmake        2015-09-25 22:04:32 UTC (rev 190255)
</span><span class="lines">@@ -1,6 +1,16 @@
</span><span class="cx"> find_library(QUARTZ_FRAMEWORK Quartz)
</span><span class="cx"> add_definitions(-iframework ${QUARTZ_FRAMEWORK}/Frameworks)
</span><span class="cx"> 
</span><ins>+find_library(DATADETECTORSCORE_FRAMEWORK DataDetectorsCore HINTS /System/Library/PrivateFrameworks)
+if (NOT DATADETECTORSCORE_FRAMEWORK-NOTFOUND)
+    list(APPEND WebCore_LIBRARIES ${DATADETECTORSCORE_FRAMEWORK})
+endif ()
+
+find_library(LOOKUP_FRAMEWORK Lookup HINTS /System/Library/PrivateFrameworks)
+if (NOT LOOKUP_FRAMEWORK-NOTFOUND)
+    list(APPEND WebCore_LIBRARIES ${LOOKUP_FRAMEWORK})
+endif ()
+
</ins><span class="cx"> list(APPEND WebCore_INCLUDE_DIRECTORIES
</span><span class="cx">     &quot;${DERIVED_SOURCES_DIR}/ForwardingHeaders/JavaScriptCore&quot;
</span><span class="cx">     &quot;${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}&quot;
</span><span class="lines">@@ -266,6 +276,7 @@
</span><span class="cx">     platform/cocoa/NetworkExtensionContentFilter.mm
</span><span class="cx">     platform/cocoa/ParentalControlsContentFilter.mm
</span><span class="cx">     platform/cocoa/ScrollController.mm
</span><ins>+    platform/cocoa/ScrollSnapAnimatorState.mm
</ins><span class="cx">     platform/cocoa/SystemVersion.mm
</span><span class="cx">     platform/cocoa/TelephoneNumberDetectorCocoa.cpp
</span><span class="cx">     platform/cocoa/ThemeCocoa.cpp
</span><span class="lines">@@ -516,6 +527,8 @@
</span><span class="cx">     Modules/notifications
</span><span class="cx">     Modules/webdatabase
</span><span class="cx"> 
</span><ins>+    Modules/indexeddb/legacy
+
</ins><span class="cx">     bindings/generic
</span><span class="cx">     bindings/js
</span><span class="cx">     bindings/objc
</span><span class="lines">@@ -631,6 +644,10 @@
</span><span class="cx">     rendering/style/RenderStyleConstants.h
</span><span class="cx"> )
</span><span class="cx"> 
</span><ins>+list(APPEND WebCore_IDL_FILES
+    Modules/plugins/QuickTimePluginReplacement.idl
+)
+
</ins><span class="cx"> set(OBJC_BINDINGS_IDL_FILES
</span><span class="cx">     dom/EventListener.idl
</span><span class="cx">     ${WebCore_NON_SVG_IDL_FILES}
</span><span class="lines">@@ -693,6 +710,7 @@
</span><span class="cx"> list(APPEND WebCore_SOURCES
</span><span class="cx">     ${DERIVED_SOURCES_WEBCORE_DIR}/DOMAttr.mm
</span><span class="cx">     ${DERIVED_SOURCES_WEBCORE_DIR}/DOMBeforeLoadEvent.mm
</span><ins>+    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMBlob.mm
</ins><span class="cx">     ${DERIVED_SOURCES_WEBCORE_DIR}/DOMCDATASection.mm
</span><span class="cx">     ${DERIVED_SOURCES_WEBCORE_DIR}/DOMCharacterData.mm
</span><span class="cx">     ${DERIVED_SOURCES_WEBCORE_DIR}/DOMComment.mm
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsDisplayRefreshMonitorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/DisplayRefreshMonitor.cpp (190254 => 190255)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/DisplayRefreshMonitor.cpp        2015-09-25 22:01:21 UTC (rev 190254)
+++ trunk/Source/WebCore/platform/graphics/DisplayRefreshMonitor.cpp        2015-09-25 22:04:32 UTC (rev 190255)
</span><span class="lines">@@ -29,9 +29,13 @@
</span><span class="cx"> #if USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR)
</span><span class="cx"> 
</span><span class="cx"> #include &quot;DisplayRefreshMonitorClient.h&quot;
</span><ins>+#include &quot;DisplayRefreshMonitorManager.h&quot;
+
+#if PLATFORM(IOS)
</ins><span class="cx"> #include &quot;DisplayRefreshMonitorIOS.h&quot;
</span><ins>+#else
</ins><span class="cx"> #include &quot;DisplayRefreshMonitorMac.h&quot;
</span><del>-#include &quot;DisplayRefreshMonitorManager.h&quot;
</del><ins>+#endif
</ins><span class="cx"> 
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (190254 => 190255)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog        2015-09-25 22:01:21 UTC (rev 190254)
+++ trunk/Source/WebKit/ChangeLog        2015-09-25 22:04:32 UTC (rev 190255)
</span><span class="lines">@@ -1,5 +1,14 @@
</span><span class="cx"> 2015-09-25  Alex Christensen  &lt;achristensen@webkit.org&gt;
</span><span class="cx"> 
</span><ins>+        Clean up CMake build on Mac
+        https://bugs.webkit.org/show_bug.cgi?id=149573
+
+        Reviewed by Chris Dumez.
+
+        * PlatformMac.cmake:
+
+2015-09-25  Alex Christensen  &lt;achristensen@webkit.org&gt;
+
</ins><span class="cx">         [Win] Switch to CMake
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=148111
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebKitPlatformMaccmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/PlatformMac.cmake (190254 => 190255)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/PlatformMac.cmake        2015-09-25 22:01:21 UTC (rev 190254)
+++ trunk/Source/WebKit/PlatformMac.cmake        2015-09-25 22:04:32 UTC (rev 190255)
</span><span class="lines">@@ -17,8 +17,6 @@
</span><span class="cx"> find_package(ZLIB REQUIRED)
</span><span class="cx"> 
</span><span class="cx"> add_definitions(-iframework ${QUARTZ_LIBRARY}/Frameworks)
</span><del>-find_library(PDFKIT_LIBRARY PDFKit HINTS ${QUARTZ_LIBRARY}/Frameworks)
-find_library(QUICKLOOKUI_LIBRARY QuickLookUI HINTS ${QUARTZ_LIBRARY}/Frameworks)
</del><span class="cx"> 
</span><span class="cx"> if (&quot;${CURRENT_OSX_VERSION}&quot; MATCHES &quot;10.9&quot;)
</span><span class="cx"> set(WEBKITSYSTEMINTERFACE_LIBRARY libWebKitSystemInterfaceMavericks.a)
</span><span class="lines">@@ -40,7 +38,6 @@
</span><span class="cx">     PRIVATE ${IOKIT_LIBRARY}
</span><span class="cx">     PRIVATE ${IOSURFACE_LIBRARY}
</span><span class="cx">     PRIVATE ${OPENGL_LIBRARY}
</span><del>-    PRIVATE ${PDFKIT_LIBRARY}
</del><span class="cx">     PRIVATE ${QUARTZ_LIBRARY}
</span><span class="cx">     PRIVATE ${QUARTZCORE_LIBRARY}
</span><span class="cx">     PRIVATE ${SECURITY_LIBRARY}
</span><span class="lines">@@ -408,13 +405,8 @@
</span><span class="cx">     COMMAND mig -I.. -sheader WebKitPluginClientServer.h WebKitPluginClient.defs
</span><span class="cx">     VERBATIM)
</span><span class="cx"> list(APPEND WebKit_SOURCES
</span><del>-    ${DERIVED_SOURCES_WEBKITLEGACY_DIR}/WebKitPluginAgentReplyServer.c
-    ${DERIVED_SOURCES_WEBKITLEGACY_DIR}/WebKitPluginAgentReplyUser.c
-    ${DERIVED_SOURCES_WEBKITLEGACY_DIR}/WebKitPluginAgentServer.c
</del><span class="cx">     ${DERIVED_SOURCES_WEBKITLEGACY_DIR}/WebKitPluginAgentUser.c
</span><span class="cx">     ${DERIVED_SOURCES_WEBKITLEGACY_DIR}/WebKitPluginClientServer.c
</span><del>-    ${DERIVED_SOURCES_WEBKITLEGACY_DIR}/WebKitPluginClientUser.c
-    ${DERIVED_SOURCES_WEBKITLEGACY_DIR}/WebKitPluginHostServer.c
</del><span class="cx">     ${DERIVED_SOURCES_WEBKITLEGACY_DIR}/WebKitPluginHostUser.c
</span><span class="cx"> )
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourcecmakeOptionsMaccmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/OptionsMac.cmake (190254 => 190255)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/OptionsMac.cmake        2015-09-25 22:01:21 UTC (rev 190254)
+++ trunk/Source/cmake/OptionsMac.cmake        2015-09-25 22:04:32 UTC (rev 190255)
</span><span class="lines">@@ -68,11 +68,13 @@
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING_macosx PRIVATE ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ICONDATABASE PRIVATE ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ICONDATABASE_macosx PRIVATE ON)
</span><ins>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INPUT_TYPE_WEEK PRIVATE OFF)
</ins><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SERVICE_CONTROLS PRIVATE ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SERVICE_CONTROLS_macosx PRIVATE ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SERVICE_CONTROLS_macosx_1080 PRIVATE OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SERVICE_CONTROLS_macosx_1090 PRIVATE OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SERVICE_CONTROLS_macosx_101000 PRIVATE ON)
</span><ins>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SMOOTH_SCROLLING PRIVATE ON)
</ins><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INDEXED_DATABASE PRIVATE ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INDEXED_DATABASE_IN_WORKERS PRIVATE OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INDIE_UI PRIVATE ON)
</span><span class="lines">@@ -227,6 +229,7 @@
</span><span class="cx"> 
</span><span class="cx"> WEBKIT_OPTION_END()
</span><span class="cx"> 
</span><ins>+set(ENABLE_GRAPHICS_CONTEXT_3D ON)
</ins><span class="cx"> set(ENABLE_WEBKIT ON)
</span><span class="cx"> set(ENABLE_WEBKIT2 ON)
</span><span class="cx"> set(USE_UDIS86 1)
</span></span></pre>
</div>
</div>

</body>
</html>