<!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>[172346] 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/172346">172346</a></dd>
<dt>Author</dt> <dd>achristensen@apple.com</dd>
<dt>Date</dt> <dd>2014-08-08 11:13:54 -0700 (Fri, 08 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Progress towards using CMake on Mac.
https://bugs.webkit.org/show_bug.cgi?id=135662
Reviewed by Laszlo Gombos.
* CMakeLists.txt:
.:
Mavericks has a flex version of "flex 2.5.35 Apple(flex-31)" which CMake doesn't like on Mac.
* Source/cmake/WebKitFeatures.cmake:
* Source/cmakeconfig.h.cmake:
Added features that are needed by the Mac port.
* Source/cmake/OptionsMac.cmake:
Enable CSS_IMAGE_SET based on FeatureDefines.h.
Disable the FTL with CMake for now.
* Source/cmake/OptionsEFL.cmake:
* Source/cmake/OptionsGTK.cmake:
Enable subpixel layout to not conflict with FeatureDefines.h
Source/WebCore:
Added necessary include directories and idls.
* PlatformEfl.cmake:
* PlatformGTK.cmake:
Moved ImageSource.cpp and image-decoders to platform CMake files because they are not used on mac.
* PlatformMac.cmake:
Corrected some sources.
* config.h:
Added workaround for not using prefix headers with CMake.
* platform/graphics/ANGLEWebKitBridge.h:
Compile fix to find ANGLE headers while using CMake.
* platform/graphics/FormatConverter.h:
* platform/mac/NSScrollerImpDetails.h:
Removed unnecessary config.h includes.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkCMakeListstxt">trunk/CMakeLists.txt</a></li>
<li><a href="#trunkChangeLog">trunk/ChangeLog</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="#trunkSourceWebCoreconfigh">trunk/Source/WebCore/config.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsANGLEWebKitBridgeh">trunk/Source/WebCore/platform/graphics/ANGLEWebKitBridge.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsFormatConverterh">trunk/Source/WebCore/platform/graphics/FormatConverter.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmacNSScrollerImpDetailsh">trunk/Source/WebCore/platform/mac/NSScrollerImpDetails.h</a></li>
<li><a href="#trunkSourcecmakeOptionsEflcmake">trunk/Source/cmake/OptionsEfl.cmake</a></li>
<li><a href="#trunkSourcecmakeOptionsGTKcmake">trunk/Source/cmake/OptionsGTK.cmake</a></li>
<li><a href="#trunkSourcecmakeOptionsMaccmake">trunk/Source/cmake/OptionsMac.cmake</a></li>
<li><a href="#trunkSourcecmakeWebKitFeaturescmake">trunk/Source/cmake/WebKitFeatures.cmake</a></li>
<li><a href="#trunkSourcecmakeconfighcmake">trunk/Source/cmakeconfig.h.cmake</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/CMakeLists.txt (172345 => 172346)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/CMakeLists.txt 2014-08-08 17:41:24 UTC (rev 172345)
+++ trunk/CMakeLists.txt 2014-08-08 18:13:54 UTC (rev 172346)
</span><span class="lines">@@ -55,7 +55,9 @@
</span><span class="cx"> # Find common packages (used by all ports)
</span><span class="cx"> # -----------------------------------------------------------------------------
</span><span class="cx"> find_package(BISON 2.3 REQUIRED)
</span><del>-find_package(FLEX 2.5.34 REQUIRED)
</del><ins>+if (!APPLE)
+ find_package(FLEX 2.5.34 REQUIRED)
+endif ()
</ins><span class="cx">
</span><span class="cx"> # TODO Enforce version requirement for gperf
</span><span class="cx"> find_package(Gperf 3.0.1 REQUIRED)
</span></span></pre></div>
<a id="trunkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/ChangeLog (172345 => 172346)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ChangeLog 2014-08-08 17:41:24 UTC (rev 172345)
+++ trunk/ChangeLog 2014-08-08 18:13:54 UTC (rev 172346)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2014-08-08 Alex Christensen <achristensen@webkit.org>
+
+ Progress towards using CMake on Mac.
+ https://bugs.webkit.org/show_bug.cgi?id=135662
+
+ Reviewed by Laszlo Gombos.
+
+ * CMakeLists.txt:
+ Mavericks has a flex version of "flex 2.5.35 Apple(flex-31)" which CMake doesn't like on Mac.
+ * Source/cmake/WebKitFeatures.cmake:
+ * Source/cmakeconfig.h.cmake:
+ Added features that are needed by the Mac port.
+ * Source/cmake/OptionsMac.cmake:
+ Enable CSS_IMAGE_SET based on FeatureDefines.h.
+ Disable the FTL with CMake for now.
+ * Source/cmake/OptionsEFL.cmake:
+ * Source/cmake/OptionsGTK.cmake:
+ Enable subpixel layout to not conflict with FeatureDefines.h
+
</ins><span class="cx"> 2014-08-08 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Undo some erroneous changes to the Xcode scheme files from r172259.
</span></span></pre></div>
<a id="trunkSourceWebCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/CMakeLists.txt (172345 => 172346)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/CMakeLists.txt 2014-08-08 17:41:24 UTC (rev 172345)
+++ trunk/Source/WebCore/CMakeLists.txt 2014-08-08 18:13:54 UTC (rev 172346)
</span><span class="lines">@@ -1,5 +1,6 @@
</span><span class="cx"> set(WebCore_INCLUDE_DIRECTORIES
</span><span class="cx"> "${WEBCORE_DIR}"
</span><ins>+ "${WEBCORE_DIR}/Modules/airplay"
</ins><span class="cx"> "${WEBCORE_DIR}/Modules/battery"
</span><span class="cx"> "${WEBCORE_DIR}/Modules/encryptedmedia"
</span><span class="cx"> "${WEBCORE_DIR}/Modules/gamepad"
</span><span class="lines">@@ -30,6 +31,7 @@
</span><span class="cx"> "${WEBCORE_DIR}/bridge/jsc"
</span><span class="cx"> "${WEBCORE_DIR}/crypto"
</span><span class="cx"> "${WEBCORE_DIR}/crypto/keys"
</span><ins>+ "${WEBCORE_DIR}/crypto/parameters"
</ins><span class="cx"> "${WEBCORE_DIR}/css"
</span><span class="cx"> "${WEBCORE_DIR}/cssjit"
</span><span class="cx"> "${WEBCORE_DIR}/dom"
</span><span class="lines">@@ -127,6 +129,7 @@
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> set(WebCore_IDL_INCLUDES
</span><ins>+ Modules/airplay
</ins><span class="cx"> Modules/battery
</span><span class="cx"> Modules/encryptedmedia
</span><span class="cx"> Modules/gamepad
</span><span class="lines">@@ -163,6 +166,8 @@
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> set(WebCore_IDL_FILES
</span><ins>+ Modules/airplay/WebKitPlaybackTargetAvailabilityEvent.idl
+
</ins><span class="cx"> Modules/battery/BatteryManager.idl
</span><span class="cx"> Modules/battery/NavigatorBattery.idl
</span><span class="cx">
</span><span class="lines">@@ -198,6 +203,8 @@
</span><span class="cx"> Modules/indexeddb/IDBVersionChangeEvent.idl
</span><span class="cx"> Modules/indexeddb/WorkerGlobalScopeIndexedDatabase.idl
</span><span class="cx">
</span><ins>+ Modules/indieui/UIRequestEvent.idl
+
</ins><span class="cx"> Modules/mediacontrols/MediaControlsHost.idl
</span><span class="cx">
</span><span class="cx"> Modules/mediasource/DOMURLMediaSource.idl
</span><span class="lines">@@ -783,6 +790,8 @@
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> set(WebCore_SOURCES
</span><ins>+ Modules/airplay/WebKitPlaybackTargetAvailabilityEvent.cpp
+
</ins><span class="cx"> Modules/battery/BatteryController.cpp
</span><span class="cx"> Modules/battery/BatteryManager.cpp
</span><span class="cx"> Modules/battery/BatteryStatus.cpp
</span><span class="lines">@@ -2084,7 +2093,6 @@
</span><span class="cx"> platform/graphics/Image.cpp
</span><span class="cx"> platform/graphics/ImageBuffer.cpp
</span><span class="cx"> platform/graphics/ImageOrientation.cpp
</span><del>- platform/graphics/ImageSource.cpp
</del><span class="cx"> platform/graphics/IntPoint.cpp
</span><span class="cx"> platform/graphics/IntRect.cpp
</span><span class="cx"> platform/graphics/IntSize.cpp
</span><span class="lines">@@ -2159,22 +2167,6 @@
</span><span class="cx"> platform/graphics/transforms/TransformationMatrix.cpp
</span><span class="cx"> platform/graphics/transforms/TranslateTransformOperation.cpp
</span><span class="cx">
</span><del>- platform/image-decoders/ImageDecoder.cpp
-
- platform/image-decoders/bmp/BMPImageDecoder.cpp
- platform/image-decoders/bmp/BMPImageReader.cpp
-
- platform/image-decoders/gif/GIFImageDecoder.cpp
- platform/image-decoders/gif/GIFImageReader.cpp
-
- platform/image-decoders/ico/ICOImageDecoder.cpp
-
- platform/image-decoders/jpeg/JPEGImageDecoder.cpp
-
- platform/image-decoders/png/PNGImageDecoder.cpp
-
- platform/image-decoders/webp/WEBPImageDecoder.cpp
-
</del><span class="cx"> platform/leveldb/LevelDBDatabase.cpp
</span><span class="cx"> platform/leveldb/LevelDBTransaction.cpp
</span><span class="cx"> platform/leveldb/LevelDBWriteBatch.cpp
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (172345 => 172346)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-08-08 17:41:24 UTC (rev 172345)
+++ trunk/Source/WebCore/ChangeLog 2014-08-08 18:13:54 UTC (rev 172346)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2014-08-08 Alex Christensen <achristensen@webkit.org>
+
+ Progress towards using CMake on Mac.
+ https://bugs.webkit.org/show_bug.cgi?id=135662
+
+ Reviewed by Laszlo Gombos.
+
+ * CMakeLists.txt:
+ Added necessary include directories and idls.
+ * PlatformEfl.cmake:
+ * PlatformGTK.cmake:
+ Moved ImageSource.cpp and image-decoders to platform CMake files because they are not used on mac.
+ * PlatformMac.cmake:
+ Corrected some sources.
+ * config.h:
+ Added workaround for not using prefix headers with CMake.
+ * platform/graphics/ANGLEWebKitBridge.h:
+ Compile fix to find ANGLE headers while using CMake.
+ * platform/graphics/FormatConverter.h:
+ * platform/mac/NSScrollerImpDetails.h:
+ Removed unnecessary config.h includes.
+
</ins><span class="cx"> 2014-08-08 Zan Dobersek <zdobersek@igalia.com>
</span><span class="cx">
</span><span class="cx"> [CMake] Drop the required version of CMake down to 2.8.8
</span></span></pre></div>
<a id="trunkSourceWebCorePlatformEflcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PlatformEfl.cmake (172345 => 172346)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PlatformEfl.cmake 2014-08-08 17:41:24 UTC (rev 172345)
+++ trunk/Source/WebCore/PlatformEfl.cmake 2014-08-08 18:13:54 UTC (rev 172346)
</span><span class="lines">@@ -101,6 +101,7 @@
</span><span class="cx"> platform/geoclue/GeolocationProviderGeoclue1.cpp
</span><span class="cx"> platform/geoclue/GeolocationProviderGeoclue2.cpp
</span><span class="cx">
</span><ins>+ platform/graphics/ImageSource.cpp
</ins><span class="cx"> platform/graphics/WOFFFileFormat.cpp
</span><span class="cx">
</span><span class="cx"> platform/graphics/cairo/BitmapImageCairo.cpp
</span><span class="lines">@@ -165,8 +166,24 @@
</span><span class="cx"> platform/graphics/texmap/coordinated/CoordinatedTile.cpp
</span><span class="cx"> platform/graphics/texmap/coordinated/UpdateAtlas.cpp
</span><span class="cx">
</span><ins>+ platform/image-decoders/ImageDecoder.cpp
+
+ platform/image-decoders/bmp/BMPImageDecoder.cpp
+ platform/image-decoders/bmp/BMPImageReader.cpp
+
</ins><span class="cx"> platform/image-decoders/cairo/ImageDecoderCairo.cpp
</span><span class="cx">
</span><ins>+ platform/image-decoders/gif/GIFImageDecoder.cpp
+ platform/image-decoders/gif/GIFImageReader.cpp
+
+ platform/image-decoders/ico/ICOImageDecoder.cpp
+
+ platform/image-decoders/jpeg/JPEGImageDecoder.cpp
+
+ platform/image-decoders/png/PNGImageDecoder.cpp
+
+ platform/image-decoders/webp/WEBPImageDecoder.cpp
+
</ins><span class="cx"> platform/linux/GamepadDeviceLinux.cpp
</span><span class="cx">
</span><span class="cx"> platform/mediastream/gstreamer/MediaStreamCenterGStreamer.cpp
</span></span></pre></div>
<a id="trunkSourceWebCorePlatformGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PlatformGTK.cmake (172345 => 172346)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PlatformGTK.cmake 2014-08-08 17:41:24 UTC (rev 172345)
+++ trunk/Source/WebCore/PlatformGTK.cmake 2014-08-08 18:13:54 UTC (rev 172346)
</span><span class="lines">@@ -41,6 +41,7 @@
</span><span class="cx"> platform/geoclue/GeolocationProviderGeoclue2.cpp
</span><span class="cx">
</span><span class="cx"> platform/graphics/GraphicsContext3DPrivate.cpp
</span><ins>+ platform/graphics/ImageSource.cpp
</ins><span class="cx"> platform/graphics/OpenGLShims.cpp
</span><span class="cx"> platform/graphics/WOFFFileFormat.cpp
</span><span class="cx">
</span><span class="lines">@@ -100,8 +101,24 @@
</span><span class="cx">
</span><span class="cx"> platform/gtk/GamepadsGtk.cpp
</span><span class="cx">
</span><ins>+ platform/image-decoders/ImageDecoder.cpp
+
</ins><span class="cx"> platform/image-decoders/cairo/ImageDecoderCairo.cpp
</span><span class="cx">
</span><ins>+ platform/image-decoders/gif/GIFImageDecoder.cpp
+ platform/image-decoders/gif/GIFImageReader.cpp
+
+ platform/image-decoders/ico/ICOImageDecoder.cpp
+
+ platform/image-decoders/jpeg/JPEGImageDecoder.cpp
+
+ platform/image-decoders/bmp/BMPImageDecoder.cpp
+ platform/image-decoders/bmp/BMPImageReader.cpp
+
+ platform/image-decoders/png/PNGImageDecoder.cpp
+
+ platform/image-decoders/webp/WEBPImageDecoder.cpp
+
</ins><span class="cx"> platform/linux/GamepadDeviceLinux.cpp
</span><span class="cx">
</span><span class="cx"> platform/mediastream/gstreamer/MediaStreamCenterGStreamer.cpp
</span></span></pre></div>
<a id="trunkSourceWebCorePlatformMaccmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PlatformMac.cmake (172345 => 172346)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PlatformMac.cmake 2014-08-08 17:41:24 UTC (rev 172345)
+++ trunk/Source/WebCore/PlatformMac.cmake 2014-08-08 18:13:54 UTC (rev 172346)
</span><span class="lines">@@ -1,7 +1,11 @@
</span><span class="cx"> list(APPEND WebCore_INCLUDE_DIRECTORIES
</span><span class="cx"> "${WEBCORE_DIR}/accessibility/mac"
</span><ins>+ "${WEBCORE_DIR}/bridge/objc"
+ "${WEBCORE_DIR}/loader/archive/cf"
+ "${WEBCORE_DIR}/loader/cf"
</ins><span class="cx"> "${WEBCORE_DIR}/page/cocoa"
</span><span class="cx"> "${WEBCORE_DIR}/page/mac"
</span><ins>+ "${WEBCORE_DIR}/platform/cf"
</ins><span class="cx"> "${WEBCORE_DIR}/platform/cocoa"
</span><span class="cx"> "${WEBCORE_DIR}/platform/graphics/avfoundation"
</span><span class="cx"> "${WEBCORE_DIR}/platform/graphics/avfoundation/cf"
</span><span class="lines">@@ -15,6 +19,8 @@
</span><span class="cx"> "${WEBCORE_DIR}/platform/network/cocoa"
</span><span class="cx"> "${WEBCORE_DIR}/platform/network/cf"
</span><span class="cx"> "${WEBCORE_DIR}/platform/network/mac"
</span><ins>+ "${WEBCORE_DIR}/platform/text/cf"
+ "${WEBCORE_DIR}/platform/text/mac"
</ins><span class="cx"> "${WEBCORE_DIR}/platform/mac"
</span><span class="cx"> "${WEBCORE_DIR}/plugins/mac"
</span><span class="cx">
</span><span class="lines">@@ -28,6 +34,12 @@
</span><span class="cx"> accessibility/mac/WebAccessibilityObjectWrapperBase.mm
</span><span class="cx"> accessibility/mac/WebAccessibilityObjectWrapperMac.mm
</span><span class="cx">
</span><ins>+ loader/archive/cf/LegacyWebArchive.cpp
+ loader/archive/cf/LegacyWebArchiveMac.mm
+
+ loader/cf/ResourceLoaderCFNet.cpp
+ loader/cf/SubresourceLoaderCF.cpp
+
</ins><span class="cx"> page/cocoa/UserAgent.mm
</span><span class="cx">
</span><span class="cx"> page/mac/ChromeMac.mm
</span><span class="lines">@@ -48,11 +60,6 @@
</span><span class="cx"> platform/graphics/avfoundation/InbandTextTrackPrivateAVF.cpp
</span><span class="cx"> platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp
</span><span class="cx">
</span><del>- platform/graphics/avfoundation/cf/CDMSessionAVFoundationCF.cpp
- platform/graphics/avfoundation/cf/InbandTextTrackPrivateAVCF.cpp
- platform/graphics/avfoundation/cf/InbandTextTrackPrivateLegacyAVCF.cpp
- platform/graphics/avfoundation/cf/WebCoreAVCFResourceLoader.cpp
-
</del><span class="cx"> platform/graphics/avfoundation/objc/AudioTrackPrivateAVFObjC.mm
</span><span class="cx"> platform/graphics/avfoundation/objc/AudioTrackPrivateMediaSourceAVFObjC.cpp
</span><span class="cx"> platform/graphics/avfoundation/objc/CDMSessionAVFoundationObjC.mm
</span><span class="lines">@@ -83,17 +90,7 @@
</span><span class="cx"> platform/graphics/ca/mac/WebTiledBackingLayer.mm
</span><span class="cx">
</span><span class="cx"> platform/graphics/opentype/OpenTypeMathData.cpp
</span><del>- platform/graphics/opentype/OpenTypeUtilities.cpp
- platform/graphics/opentype/OpenTypeVerticalData.cpp
</del><span class="cx">
</span><del>- platform/graphics/win/DIBPixelData.cpp
- platform/graphics/win/GDIExtras.cpp
- platform/graphics/win/IconWin.cpp
- platform/graphics/win/ImageWin.cpp
- platform/graphics/win/IntPointWin.cpp
- platform/graphics/win/IntRectWin.cpp
- platform/graphics/win/IntSizeWin.cpp
-
</del><span class="cx"> platform/mac/BlockExceptions.mm
</span><span class="cx"> platform/mac/ContentFilterMac.mm
</span><span class="cx"> platform/mac/ContextMenuItemMac.mm
</span><span class="lines">@@ -196,6 +193,13 @@
</span><span class="cx"> platform/network/mac/WebCoreResourceHandleAsOperationQueueDelegate.mm
</span><span class="cx"> platform/network/mac/WebCoreURLResponse.mm
</span><span class="cx">
</span><ins>+ platform/text/cf/HyphenationCF.cpp
+
+ platform/text/mac/LocaleMac.mm
+ platform/text/mac/TextBoundaries.mm
+ platform/text/mac/TextBreakIteratorInternalICUMac.mm
+ platform/text/mac/TextCodecMac.cpp
+
</ins><span class="cx"> plugins/mac/PluginPackageMac.cpp
</span><span class="cx"> plugins/mac/PluginViewMac.mm
</span><span class="cx"> )
</span></span></pre></div>
<a id="trunkSourceWebCoreconfigh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/config.h (172345 => 172346)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/config.h 2014-08-08 17:41:24 UTC (rev 172345)
+++ trunk/Source/WebCore/config.h 2014-08-08 18:13:54 UTC (rev 172346)
</span><span class="lines">@@ -61,6 +61,11 @@
</span><span class="cx">
</span><span class="cx"> #endif /* OS(WINDOWS) */
</span><span class="cx">
</span><ins>+// Using CMake with Unix makefiles does not use prefix headers.
+#if PLATFORM(MAC) && defined(BUILDING_WITH_CMAKE)
+#include "WebCorePrefix.h"
+#endif
+
</ins><span class="cx"> #ifdef __cplusplus
</span><span class="cx">
</span><span class="cx"> // These undefs match up with defines in WebCorePrefix.h for Mac OS X.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsANGLEWebKitBridgeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ANGLEWebKitBridge.h (172345 => 172346)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ANGLEWebKitBridge.h 2014-08-08 17:41:24 UTC (rev 172345)
+++ trunk/Source/WebCore/platform/graphics/ANGLEWebKitBridge.h 2014-08-08 18:13:54 UTC (rev 172346)
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><del>-#if !PLATFORM(GTK) && !PLATFORM(EFL) && !PLATFORM(WIN)
</del><ins>+#if !PLATFORM(GTK) && !PLATFORM(EFL) && !PLATFORM(WIN) && !defined(BUILDING_WITH_CMAKE)
</ins><span class="cx"> #include "ANGLE/ShaderLang.h"
</span><span class="cx"> #elif PLATFORM(WIN)
</span><span class="cx"> #include "GLSLANG/ShaderLang.h"
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFormatConverterh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/FormatConverter.h (172345 => 172346)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/FormatConverter.h 2014-08-08 17:41:24 UTC (rev 172345)
+++ trunk/Source/WebCore/platform/graphics/FormatConverter.h 2014-08-08 18:13:54 UTC (rev 172346)
</span><span class="lines">@@ -25,8 +25,6 @@
</span><span class="cx"> * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#include "config.h"
-
</del><span class="cx"> #if USE(3D_GRAPHICS)
</span><span class="cx">
</span><span class="cx"> #include "GraphicsContext3D.h"
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacNSScrollerImpDetailsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/NSScrollerImpDetails.h (172345 => 172346)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/NSScrollerImpDetails.h 2014-08-08 17:41:24 UTC (rev 172345)
+++ trunk/Source/WebCore/platform/mac/NSScrollerImpDetails.h 2014-08-08 18:13:54 UTC (rev 172346)
</span><span class="lines">@@ -26,8 +26,6 @@
</span><span class="cx"> #ifndef WebCore_NSScrollerImpDetails_h
</span><span class="cx"> #define WebCore_NSScrollerImpDetails_h
</span><span class="cx">
</span><del>-#include "config.h"
-
</del><span class="cx"> // Public APIs not available on versions of Mac on which we build
</span><span class="cx">
</span><span class="cx"> @interface NSObject (ScrollbarPainter)
</span></span></pre></div>
<a id="trunkSourcecmakeOptionsEflcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/OptionsEfl.cmake (172345 => 172346)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/OptionsEfl.cmake 2014-08-08 17:41:24 UTC (rev 172345)
+++ trunk/Source/cmake/OptionsEfl.cmake 2014-08-08 18:13:54 UTC (rev 172346)
</span><span class="lines">@@ -95,6 +95,7 @@
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SHARED_WORKERS ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SPEECH_SYNTHESIS OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SPELLCHECK ON)
</span><ins>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SUBPIXEL_LAYOUT ON)
</ins><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_TEMPLATE_ELEMENT ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_TOUCH_EVENTS ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_TOUCH_SLIDER ON)
</span></span></pre></div>
<a id="trunkSourcecmakeOptionsGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/OptionsGTK.cmake (172345 => 172346)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/OptionsGTK.cmake 2014-08-08 17:41:24 UTC (rev 172345)
+++ trunk/Source/cmake/OptionsGTK.cmake 2014-08-08 18:13:54 UTC (rev 172346)
</span><span class="lines">@@ -137,6 +137,7 @@
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SECCOMP_FILTERS OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SHARED_WORKERS ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SPELLCHECK ON)
</span><ins>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SUBPIXEL_LAYOUT ON)
</ins><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_TEMPLATE_ELEMENT ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_TOUCH_EVENTS ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_USERSELECT_ALL ON)
</span></span></pre></div>
<a id="trunkSourcecmakeOptionsMaccmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/OptionsMac.cmake (172345 => 172346)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/OptionsMac.cmake 2014-08-08 17:41:24 UTC (rev 172345)
+++ trunk/Source/cmake/OptionsMac.cmake 2014-08-08 18:13:54 UTC (rev 172346)
</span><span class="lines">@@ -24,6 +24,7 @@
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_GRID_LAYOUT ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_IMAGE_ORIENTATION OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_IMAGE_RESOLUTION OFF)
</span><ins>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_IMAGE_SET ON)
</ins><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_REGIONS ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_SHAPES ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS3_CONDITIONAL_RULES ON)
</span><span class="lines">@@ -205,9 +206,10 @@
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_XHR_TIMEOUT ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_XSLT ON)
</span><span class="cx">
</span><del>-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FTL_JIT ON)
-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FTL_JIT_macosx ON)
-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FTL_JIT_iphoneos ON)
</del><ins>+# FIXME: These are turned off temporarily to get CMake working easier.
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FTL_JIT OFF)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FTL_JIT_macosx OFF)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FTL_JIT_iphoneos OFF)
</ins><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FTL_JIT_iphonesimulator OFF)
</span><span class="cx">
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LLINT_C_LOOP OFF)
</span></span></pre></div>
<a id="trunkSourcecmakeWebKitFeaturescmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/WebKitFeatures.cmake (172345 => 172346)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/WebKitFeatures.cmake 2014-08-08 17:41:24 UTC (rev 172345)
+++ trunk/Source/cmake/WebKitFeatures.cmake 2014-08-08 18:13:54 UTC (rev 172346)
</span><span class="lines">@@ -17,13 +17,17 @@
</span><span class="cx"> macro(WEBKIT_OPTION_BEGIN)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_3D_RENDERING "Toggle 3D rendering support" OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_ACCELERATED_2D_CANVAS "Toggle accelerated 2D canvas support" OFF)
</span><ins>+ WEBKIT_OPTION_DEFINE(ENABLE_ACCELERATED_OVERFLOW_SCROLLING "Toggle accelerated scrolling support" OFF)
</ins><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_ACCESSIBILITY "Toggle accessibility support" OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_API_TESTS "Enable public API unit tests" OFF)
</span><ins>+ WEBKIT_OPTION_DEFINE(ENABLE_AVF_CAPTIONS "Toggle AVFoundation caption support" OFF)
</ins><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_ASSEMBLER_WX_EXCLUSIVE "Toggle Assembler WX Exclusive support" OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_BATTERY_STATUS "Toggle battery status API support" OFF)
</span><ins>+ WEBKIT_OPTION_DEFINE(ENABLE_CACHE_PARTITIONING "Toggle cache partitioning support" OFF)
</ins><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_CANVAS_PATH "Toggle Canvas Path support" ON)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_CANVAS_PROXY "Toggle CanvasProxy support" OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_CHANNEL_MESSAGING "Toggle MessageChannel and MessagePort support" ON)
</span><ins>+ WEBKIT_OPTION_DEFINE(ENABLE_CONTENT_FILTERING "Toggle content filtering support" OFF)
</ins><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_CONTEXT_MENUS "Toggle Context Menu support" ON)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_CSP_NEXT "Toggle Content Security Policy 1.1 support" OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_CSS3_CONDITIONAL_RULES "Toggle CSS3 Conditional Rules support" OFF)
</span><span class="lines">@@ -40,7 +44,10 @@
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_CSS_REGIONS "Toggle CSS regions support" OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_CSS_SELECTORS_LEVEL4 "Toggle CSS Selectors Level 4 support" OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_CSS_SHAPES "Toggle CSS Shapes support" OFF)
</span><ins>+ WEBKIT_OPTION_DEFINE(ENABLE_CURSOR_VISIBILITY "Toggle cursor visibility support" OFF)
</ins><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_CUSTOM_SCHEME_HANDLER "Toggle Custom Scheme Handler support" OFF)
</span><ins>+ WEBKIT_OPTION_DEFINE(ENABLE_DASHBOARD_SUPPORT "Toggle dashboard support" OFF)
+ WEBKIT_OPTION_DEFINE(ENABLE_DATACUE_VALUE "Toggle datacue value support" OFF)
</ins><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_DATALIST_ELEMENT "Toggle HTML5 datalist support" OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_DATA_TRANSFER_ITEMS "Toggle HTML5 data transfer items support" OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_DETAILS_ELEMENT "Toggle HTML5 details support" ON)
</span><span class="lines">@@ -52,6 +59,7 @@
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_ENCRYPTED_MEDIA_V2 "Support EME v2" OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_FILTERS "Toggle SVG Filters support" OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_FONT_LOAD_EVENTS "Toggle Font Load Events support" OFF)
</span><ins>+ WEBKIT_OPTION_DEFINE(ENABLE_FTL_JIT "Toggle FTL support for JSC" OFF)
</ins><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_FTPDIR "Toggle FTP directory support" ON)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_FULLSCREEN_API "Toggle Fullscreen API support" OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_GAMEPAD "Toggle Gamepad support" OFF)
</span><span class="lines">@@ -62,7 +70,9 @@
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_ICONDATABASE "Toggle Icon database support" ON)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_IMAGE_DECODER_DOWN_SAMPLING "Toggle image decoder down sampling support" OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_INDEXED_DATABASE "Toggle Indexed Database API support" OFF)
</span><ins>+ WEBKIT_OPTION_DEFINE(ENABLE_INDIE_UI "Toggle Indie UI support" OFF)
</ins><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_INPUT_TYPE_COLOR "Toggle Color Input support" OFF)
</span><ins>+ WEBKIT_OPTION_DEFINE(ENABLE_INPUT_TYPE_COLOR_POPOVER "Toggle popover color input support" OFF)
</ins><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_INPUT_TYPE_DATE "Toggle date type <input> support" OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE "Toggle broken datetime type <input> support" OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_INPUT_TYPE_DATETIMELOCAL "Toggle datetime-local type <input> support" OFF)
</span><span class="lines">@@ -70,12 +80,17 @@
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_INPUT_TYPE_TIME "Toggle time type <input> support" OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_INPUT_TYPE_WEEK "Toggle week type <input> support" OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_INSPECTOR "Toggle Web Inspector support" ON)
</span><ins>+ WEBKIT_OPTION_DEFINE(ENABLE_IOS_AIRPLAY "Toggle iOS airplay support" OFF)
+ WEBKIT_OPTION_DEFINE(ENABLE_IOS_TEXT_AUTOSIZING "Toggle iOS text autosizing support" OFF)
</ins><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_JIT "Enable JustInTime javascript support" ON)
</span><ins>+ WEBKIT_OPTION_DEFINE(ENABLE_LEGACY_CSS_VENDOR_PREFIXES "Toggle legacy css vendor prefix support" OFF)
</ins><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_LEGACY_NOTIFICATIONS "Toggle Legacy Desktop Notifications Support" OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_LEGACY_VENDOR_PREFIXES "Toggle Legacy Vendor Prefix Support" ON)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_LEGACY_WEB_AUDIO "Toggle Legacy Web Audio support" ON)
</span><ins>+ WEBKIT_OPTION_DEFINE(ENABLE_LETTERPRESS "Toggle letterpress support" OFF)
</ins><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_LINK_PREFETCH "Toggle pre fetching support" OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_LLINT_C_LOOP "Force use of the llint c loop" OFF)
</span><ins>+ WEBKIT_OPTION_DEFINE(ENABLE_MAC_LONG_PRESS "Toggle mac long press support" OFF)
</ins><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_MATHML "Toggle MathML support" ON)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_MEDIA_CAPTURE "Toggle Media Capture support" OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_MEDIA_CONTROLS_SCRIPT "Toggle definition of media controls in Javascript" OFF)
</span><span class="lines">@@ -93,20 +108,28 @@
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_NETWORK_PROCESS "Toggle dedicated network process support in WebKit2" OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_NOTIFICATIONS "Toggle Desktop Notifications Support" OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_ORIENTATION_EVENTS "Toggle Orientation Events support" OFF)
</span><ins>+ WEBKIT_OPTION_DEFINE(ENABLE_PDFKIT_PLUGIN "Toggle PDFKit plugin support" OFF)
</ins><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_PERFORMANCE_TIMELINE "Toggle Performance Timeline support" OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_PICTURE_SIZES "Toggle sizes attribute support" OFF)
</span><ins>+ WEBKIT_OPTION_DEFINE(ENABLE_POINTER_LOCK "Toggle pointer lock support" OFF)
</ins><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_PROMISES "Toggle Promise support" ON)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_PROXIMITY_EVENTS "Toggle Proximity Events support" OFF)
</span><ins>+ WEBKIT_OPTION_DEFINE(ENABLE_PUBLIC_SUFFIX_LIST "Toggle public suffix list support" OFF)
</ins><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_QUOTA "Toggle Quota support" OFF)
</span><ins>+ WEBKIT_OPTION_DEFINE(ENABLE_REMOTE_INSPECTOR "Toggle remote inspector support" OFF)
</ins><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_REQUEST_ANIMATION_FRAME "Toggle requestAnimationFrame support" OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_RESOLUTION_MEDIA_QUERY "Toggle resolution media query support" OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_RESOURCE_TIMING "Toggle Resource Timing support" OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_SECCOMP_FILTERS "Toggle Linux seccomp filters for the WebProcess support" OFF)
</span><ins>+ WEBKIT_OPTION_DEFINE(ENABLE_SERVICE_CONTROLS "Toggle service controls support" OFF)
</ins><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_SHARED_WORKERS "Toggle SharedWorkers support" OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_SPEECH_SYNTHESIS "Toggle Speech Synthesis API support)" OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_SPELLCHECK "Toggle Spellchecking support (requires Enchant)" OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_SQL_DATABASE "Toggle SQL Database Support" ON)
</span><ins>+ WEBKIT_OPTION_DEFINE(ENABLE_SUBPIXEL_LAYOUT "Toggle subpixel layout support" OFF)
+ WEBKIT_OPTION_DEFINE(ENABLE_SUBTLE_CRYPTO "Toggle subtle crypto support" OFF)
</ins><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_SVG_FONTS "Toggle SVG fonts support (imples SVG support)" ON)
</span><ins>+ WEBKIT_OPTION_DEFINE(ENABLE_TELEPHONE_NUMBER_DETECTION "Toggle telephone number detection support" OFF)
</ins><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_TEMPLATE_ELEMENT "Toggle Template support" ON)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_TEXT_AUTOSIZING "Toggle Text auto sizing support" OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_TOUCH_EVENTS "Toggle Touch Events support" OFF)
</span><span class="lines">@@ -123,6 +146,7 @@
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_WEB_SOCKETS "Toggle Web Sockets support" ON)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_WEB_TIMING "Toggle Web Timing support" OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_WEBGL "Toggle 3D canvas (WebGL) support" OFF)
</span><ins>+ WEBKIT_OPTION_DEFINE(ENABLE_WEBVTT_REGIONS "Toggle webvtt region support" OFF)
</ins><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_XHR_TIMEOUT "Toggle XHR timeout support" OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_XSLT "Toggle XSLT support" ON)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(USE_SYSTEM_MALLOC "Toggle system allocator instead of TCmalloc" OFF)
</span></span></pre></div>
<a id="trunkSourcecmakeconfighcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmakeconfig.h.cmake (172345 => 172346)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmakeconfig.h.cmake 2014-08-08 17:41:24 UTC (rev 172345)
+++ trunk/Source/cmakeconfig.h.cmake 2014-08-08 18:13:54 UTC (rev 172346)
</span><span class="lines">@@ -5,11 +5,14 @@
</span><span class="cx"> #cmakedefine01 ENABLE_ACCELERATED_2D_CANVAS
</span><span class="cx"> #cmakedefine01 ENABLE_ACCELERATED_OVERFLOW_SCROLLING
</span><span class="cx"> #cmakedefine01 ENABLE_API_TESTS
</span><ins>+#cmakedefine01 ENABLE_AVF_CAPTIONS
</ins><span class="cx"> #cmakedefine01 ENABLE_ASSEMBLER_WX_EXCLUSIVE
</span><span class="cx"> #cmakedefine01 ENABLE_BATTERY_STATUS
</span><ins>+#cmakedefine01 ENABLE_CACHE_PARTITIONING
</ins><span class="cx"> #cmakedefine01 ENABLE_CANVAS_PATH
</span><span class="cx"> #cmakedefine01 ENABLE_CANVAS_PROXY
</span><span class="cx"> #cmakedefine01 ENABLE_CHANNEL_MESSAGING
</span><ins>+#cmakedefine01 ENABLE_CONTENT_FILTERING
</ins><span class="cx"> #cmakedefine01 ENABLE_CONTEXT_MENUS
</span><span class="cx"> #cmakedefine01 ENABLE_CREDENTIAL_STORAGE
</span><span class="cx"> #cmakedefine01 ENABLE_CSP_NEXT
</span><span class="lines">@@ -27,7 +30,10 @@
</span><span class="cx"> #cmakedefine01 ENABLE_CSS_SELECTORS_LEVEL4
</span><span class="cx"> #cmakedefine01 ENABLE_CSS_SHAPES
</span><span class="cx"> #cmakedefine01 ENABLE_CSS3_CONDITIONAL_RULES
</span><ins>+#cmakedefine01 ENABLE_CURSOR_VISIBILITY
</ins><span class="cx"> #cmakedefine01 ENABLE_CUSTOM_SCHEME_HANDLER
</span><ins>+#cmakedefine01 ENABLE_DASHBOARD_SUPPORT
+#cmakedefine01 ENABLE_DATACUE_VALUE
</ins><span class="cx"> #cmakedefine01 ENABLE_DATALIST_ELEMENT
</span><span class="cx"> #cmakedefine01 ENABLE_DATA_TRANSFER_ITEMS
</span><span class="cx"> #cmakedefine01 ENABLE_DETAILS_ELEMENT
</span><span class="lines">@@ -52,7 +58,9 @@
</span><span class="cx"> #cmakedefine01 ENABLE_IMAGE_DECODER_DOWN_SAMPLING
</span><span class="cx"> #cmakedefine01 ENABLE_INDEXED_DATABASE
</span><span class="cx"> #cmakedefine01 ENABLE_INDEXED_DATABASE_IN_WORKERS
</span><ins>+#cmakedefine01 ENABLE_INDIE_UI
</ins><span class="cx"> #cmakedefine01 ENABLE_INPUT_TYPE_COLOR
</span><ins>+#cmakedefine01 ENABLE_INPUT_TYPE_COLOR_POPOVER
</ins><span class="cx"> #cmakedefine01 ENABLE_INPUT_TYPE_DATE
</span><span class="cx"> #cmakedefine01 ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE
</span><span class="cx"> #cmakedefine01 ENABLE_INPUT_TYPE_DATETIMELOCAL
</span><span class="lines">@@ -60,7 +68,10 @@
</span><span class="cx"> #cmakedefine01 ENABLE_INPUT_TYPE_MONTH
</span><span class="cx"> #cmakedefine01 ENABLE_INPUT_TYPE_WEEK
</span><span class="cx"> #cmakedefine01 ENABLE_INSPECTOR
</span><ins>+#cmakedefine01 ENABLE_IOS_AIRPLAY
+#cmakedefine01 ENABLE_IOS_TEXT_AUTOSIZING
</ins><span class="cx"> #cmakedefine01 ENABLE_JIT
</span><ins>+#cmakedefine01 ENABLE_LEGACY_CSS_VENDOR_PREFIXES
</ins><span class="cx"> #cmakedefine01 ENABLE_LEGACY_NOTIFICATIONS
</span><span class="cx"> #cmakedefine01 ENABLE_LEGACY_VENDOR_PREFIXES
</span><span class="cx"> #cmakedefine01 ENABLE_LEGACY_WEB_AUDIO
</span><span class="lines">@@ -83,20 +94,28 @@
</span><span class="cx"> #cmakedefine01 ENABLE_NETWORK_PROCESS
</span><span class="cx"> #cmakedefine01 ENABLE_NOTIFICATIONS
</span><span class="cx"> #cmakedefine01 ENABLE_ORIENTATION_EVENTS
</span><ins>+#cmakedefine01 ENABLE_PDFKIT_PLUGIN
</ins><span class="cx"> #cmakedefine01 ENABLE_PERFORMANCE_TIMELINE
</span><span class="cx"> #cmakedefine01 ENABLE_PICTURE_SIZES
</span><ins>+#cmakedefine01 ENABLE_POINTER_LOCK
</ins><span class="cx"> #cmakedefine01 ENABLE_PROMISES
</span><span class="cx"> #cmakedefine01 ENABLE_PROXIMITY_EVENTS
</span><ins>+#cmakedefine01 ENABLE_PUBLIC_SUFFIX_LIST
</ins><span class="cx"> #cmakedefine01 ENABLE_QUOTA
</span><ins>+#cmakedefine01 ENABLE_REMOTE_INSPECTOR
</ins><span class="cx"> #cmakedefine01 ENABLE_REQUEST_ANIMATION_FRAME
</span><span class="cx"> #cmakedefine01 ENABLE_RESOLUTION_MEDIA_QUERY
</span><span class="cx"> #cmakedefine01 ENABLE_RESOURCE_TIMING
</span><span class="cx"> #cmakedefine01 ENABLE_SECCOMP_FILTERS
</span><ins>+#cmakedefine01 ENABLE_SERVICE_CONTROLS
</ins><span class="cx"> #cmakedefine01 ENABLE_SHARED_WORKERS
</span><span class="cx"> #cmakedefine01 ENABLE_SMOOTH_SCROLLING
</span><span class="cx"> #cmakedefine01 ENABLE_SPELLCHECK
</span><span class="cx"> #cmakedefine01 ENABLE_SQL_DATABASE
</span><ins>+#cmakedefine01 ENABLE_SUBPIXEL_LAYOUT
+#cmakedefine01 ENABLE_SUBTLE_CRYPTO
</ins><span class="cx"> #cmakedefine01 ENABLE_SVG_FONTS
</span><ins>+#cmakedefine01 ENABLE_TELEPHONE_NUMBER_DETECTION
</ins><span class="cx"> #cmakedefine01 ENABLE_TEMPLATE_ELEMENT
</span><span class="cx"> #cmakedefine01 ENABLE_TEXT_AUTOSIZING
</span><span class="cx"> #cmakedefine01 ENABLE_TOUCH_EVENTS
</span><span class="lines">@@ -111,6 +130,7 @@
</span><span class="cx"> #cmakedefine01 ENABLE_VIEW_MODE_CSS_MEDIA
</span><span class="cx"> #cmakedefine01 ENABLE_WEBGL
</span><span class="cx"> #cmakedefine01 ENABLE_WEB_AUDIO
</span><ins>+#cmakedefine01 ENABLE_WEBVTT_REGIONS
</ins><span class="cx"> #cmakedefine01 ENABLE_WEB_REPLAY
</span><span class="cx"> #cmakedefine01 ENABLE_WEB_SOCKETS
</span><span class="cx"> #cmakedefine01 ENABLE_WEB_TIMING
</span></span></pre>
</div>
</div>
</body>
</html>