<!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>[182996] 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/182996">182996</a></dd>
<dt>Author</dt> <dd>gyuyoung.kim@webkit.org</dd>
<dt>Date</dt> <dd>2015-04-19 18:28:34 -0700 (Sun, 19 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[CMake] Synchronize variables between WebKitFeatures.cmake and cmakedonfig.h.cmake
https://bugs.webkit.org/show_bug.cgi?id=143935
Reviewed by Darin Adler.
Some variables aren't defined in these files or unused variables aren't removed. This
patch cleans up it as well as fix wrong alphabet order.
* Source/cmake/WebKitFeatures.cmake:
* Source/cmakeconfig.h.cmake:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkChangeLog">trunk/ChangeLog</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="trunkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/ChangeLog (182995 => 182996)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ChangeLog 2015-04-19 18:59:39 UTC (rev 182995)
+++ trunk/ChangeLog 2015-04-20 01:28:34 UTC (rev 182996)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2015-04-19 Gyuyoung Kim <gyuyoung.kim@webkit.org>
+
+ [CMake] Synchronize variables between WebKitFeatures.cmake and cmakedonfig.h.cmake
+ https://bugs.webkit.org/show_bug.cgi?id=143935
+
+ Reviewed by Darin Adler.
+
+ Some variables aren't defined in these files or unused variables aren't removed. This
+ patch cleans up it as well as fix wrong alphabet order.
+
+ * Source/cmake/WebKitFeatures.cmake:
+ * Source/cmakeconfig.h.cmake:
+
</ins><span class="cx"> 2015-04-19 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Restore the WebKit.xcworkspace to the way it was before r182899,
</span></span></pre></div>
<a id="trunkSourcecmakeWebKitFeaturescmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/WebKitFeatures.cmake (182995 => 182996)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/WebKitFeatures.cmake 2015-04-19 18:59:39 UTC (rev 182995)
+++ trunk/Source/cmake/WebKitFeatures.cmake 2015-04-20 01:28:34 UTC (rev 182996)
</span><span class="lines">@@ -41,6 +41,7 @@
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_ES6_CLASS_SYNTAX "Toggle ES6 class syntax support" ON)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_CONTENT_FILTERING "Toggle content filtering support" OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_CONTEXT_MENUS "Toggle Context Menu support" ON)
</span><ins>+ WEBKIT_OPTION_DEFINE(ENABLE_CREDENTIAL_STORAGE "Toggle Credential Storage support" OFF)
</ins><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_TEXT "Toggle CSS3 Text support" OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_CSS3_TEXT_LINE_BREAK "Toggle CSS3 Text Line Break support" OFF)
</span><span class="lines">@@ -52,8 +53,8 @@
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_CSS_IMAGE_RESOLUTION "Toggle CSS image-resolution support" OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_CSS_IMAGE_SET "Toggle CSS image-set support" OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_CSS_REGIONS "Toggle CSS regions support" OFF)
</span><ins>+ WEBKIT_OPTION_DEFINE(ENABLE_CSS_SCROLL_SNAP "Toggle CSS snap scroll support" OFF)
</ins><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_CSS_SELECTORS_LEVEL4 "Toggle CSS Selectors Level 4 support" OFF)
</span><del>- WEBKIT_OPTION_DEFINE(ENABLE_CSS_SCROLL_SNAP "Toggle CSS snap scroll support" OFF)
</del><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_CSS_SHAPES "Toggle CSS Shapes support" OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_CURSOR_VISIBILITY "Toggle cursor visibility support" OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_CUSTOM_SCHEME_HANDLER "Toggle Custom Scheme Handler support" OFF)
</span><span class="lines">@@ -70,8 +71,8 @@
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_ENCRYPTED_MEDIA_V2 "Support EME v2" OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_FILTERS_LEVEL_2 "Toggle Filters Module Level 2" OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_FONT_LOAD_EVENTS "Toggle Font Load Events support" OFF)
</span><ins>+ WEBKIT_OPTION_DEFINE(ENABLE_FTPDIR "Toggle FTP directory support" ON)
</ins><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_FTL_JIT "Toggle FTL support for JSC" OFF)
</span><del>- WEBKIT_OPTION_DEFINE(ENABLE_FTPDIR "Toggle FTP directory support" ON)
</del><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="cx"> WEBKIT_OPTION_DEFINE(ENABLE_GAMEPAD_DEPRECATED "Toggle deprecated Gamepad support" OFF)
</span><span class="lines">@@ -151,12 +152,12 @@
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_VIDEO "Toggle Video support" OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_VIDEO_TRACK "Toggle Track support for HTML5 video" OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_VIEW_MODE_CSS_MEDIA "Toggle Track support for the view-mode media Feature" ON)
</span><ins>+ WEBKIT_OPTION_DEFINE(ENABLE_WEBGL "Toggle 3D canvas (WebGL) support" OFF)
+ WEBKIT_OPTION_DEFINE(ENABLE_WEBVTT_REGIONS "Toggle webvtt region support" OFF)
</ins><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_WEB_AUDIO "Toggle Web Audio support" OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_WEB_REPLAY "Toggle Web Replay support" OFF)
</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><del>- WEBKIT_OPTION_DEFINE(ENABLE_WEBGL "Toggle 3D canvas (WebGL) support" OFF)
- WEBKIT_OPTION_DEFINE(ENABLE_WEBVTT_REGIONS "Toggle webvtt region support" OFF)
</del><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 WebKit's custom allocator" OFF)
</span></span></pre></div>
<a id="trunkSourcecmakeconfighcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmakeconfig.h.cmake (182995 => 182996)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmakeconfig.h.cmake 2015-04-19 18:59:39 UTC (rev 182995)
+++ trunk/Source/cmakeconfig.h.cmake 2015-04-20 01:28:34 UTC (rev 182996)
</span><span class="lines">@@ -4,6 +4,7 @@
</span><span class="cx"> #cmakedefine01 ENABLE_3D_RENDERING
</span><span class="cx"> #cmakedefine01 ENABLE_ACCELERATED_2D_CANVAS
</span><span class="cx"> #cmakedefine01 ENABLE_ACCELERATED_OVERFLOW_SCROLLING
</span><ins>+#cmakedefine01 ENABLE_ACCESSIBILITY
</ins><span class="cx"> #cmakedefine01 ENABLE_API_TESTS
</span><span class="cx"> #cmakedefine01 ENABLE_ATTACHMENT_ELEMENT
</span><span class="cx"> #cmakedefine01 ENABLE_AVF_CAPTIONS
</span><span class="lines">@@ -21,8 +22,8 @@
</span><span class="cx"> #cmakedefine01 ENABLE_CSS3_TEXT
</span><span class="cx"> #cmakedefine01 ENABLE_CSS3_TEXT_LINE_BREAK
</span><span class="cx"> #cmakedefine01 ENABLE_CSS_BOX_DECORATION_BREAK
</span><del>-#cmakedefine01 ENABLE_CSS_DEVICE_ADAPTATION
</del><span class="cx"> #cmakedefine01 ENABLE_CSS_COMPOSITING
</span><ins>+#cmakedefine01 ENABLE_CSS_DEVICE_ADAPTATION
</ins><span class="cx"> #cmakedefine01 ENABLE_CSS_GRID_LAYOUT
</span><span class="cx"> #cmakedefine01 ENABLE_CSS_IMAGE_ORIENTATION
</span><span class="cx"> #cmakedefine01 ENABLE_CSS_IMAGE_RESOLUTION
</span><span class="lines">@@ -44,13 +45,11 @@
</span><span class="cx"> #cmakedefine01 ENABLE_DRAG_SUPPORT
</span><span class="cx"> #cmakedefine01 ENABLE_ENCRYPTED_MEDIA
</span><span class="cx"> #cmakedefine01 ENABLE_ENCRYPTED_MEDIA_V2
</span><del>-#cmakedefine01 ENABLE_EVENT_MODE_METATAGS
</del><span class="cx"> #cmakedefine01 ENABLE_FILTERS_LEVEL_2
</span><del>-#cmakedefine01 ENABLE_FIXED_REPORTED_SIZE
</del><ins>+#cmakedefine01 ENABLE_FONT_LOAD_EVENTS
</ins><span class="cx"> #cmakedefine01 ENABLE_FTPDIR
</span><span class="cx"> #cmakedefine01 ENABLE_FTL_JIT
</span><span class="cx"> #cmakedefine01 ENABLE_FTL_NATIVE_CALL_INLINING
</span><del>-#cmakedefine01 ENABLE_FONT_LOAD_EVENTS
</del><span class="cx"> #cmakedefine01 ENABLE_FULLSCREEN_API
</span><span class="cx"> #cmakedefine01 ENABLE_GAMEPAD
</span><span class="cx"> #cmakedefine01 ENABLE_GAMEPAD_DEPRECATED
</span><span class="lines">@@ -78,6 +77,7 @@
</span><span class="cx"> #cmakedefine01 ENABLE_LEGACY_WEB_AUDIO
</span><span class="cx"> #cmakedefine01 ENABLE_LINK_PREFETCH
</span><span class="cx"> #cmakedefine01 ENABLE_LLINT_C_LOOP
</span><ins>+#cmakedefine01 ENABLE_MAC_LONG_PRESS
</ins><span class="cx"> #cmakedefine01 ENABLE_MATHML
</span><span class="cx"> #cmakedefine01 ENABLE_MEDIA_CAPTURE
</span><span class="cx"> #cmakedefine01 ENABLE_MEDIA_CONTROLS_SCRIPT
</span><span class="lines">@@ -108,9 +108,9 @@
</span><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><ins>+#cmakedefine01 ENABLE_SATURATED_LAYOUT_ARITHMETIC
</ins><span class="cx"> #cmakedefine01 ENABLE_SECCOMP_FILTERS
</span><span class="cx"> #cmakedefine01 ENABLE_SERVICE_CONTROLS
</span><del>-#cmakedefine01 ENABLE_SATURATED_LAYOUT_ARITHMETIC
</del><span class="cx"> #cmakedefine01 ENABLE_SMOOTH_SCROLLING
</span><span class="cx"> #cmakedefine01 ENABLE_SPELLCHECK
</span><span class="cx"> #cmakedefine01 ENABLE_STREAMS_API
</span><span class="lines">@@ -128,11 +128,10 @@
</span><span class="cx"> #cmakedefine01 ENABLE_VIBRATION
</span><span class="cx"> #cmakedefine01 ENABLE_VIDEO
</span><span class="cx"> #cmakedefine01 ENABLE_VIDEO_TRACK
</span><del>-#cmakedefine01 ENABLE_VIEWPORT_REFLOW
</del><span class="cx"> #cmakedefine01 ENABLE_VIEW_MODE_CSS_MEDIA
</span><span class="cx"> #cmakedefine01 ENABLE_WEBGL
</span><del>-#cmakedefine01 ENABLE_WEB_AUDIO
</del><span class="cx"> #cmakedefine01 ENABLE_WEBVTT_REGIONS
</span><ins>+#cmakedefine01 ENABLE_WEB_AUDIO
</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>