[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:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@182996 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/ChangeLog b/ChangeLog
index cc0a6e9..7913253 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+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:
+

 2015-04-19  Simon Fraser  <simon.fraser@apple.com>
 
         Restore the WebKit.xcworkspace to the way it was before r182899,
 2015-04-19  Simon Fraser  <simon.fraser@apple.com>
 
         Restore the WebKit.xcworkspace to the way it was before r182899,

diff --git a/Source/cmake/WebKitFeatures.cmake b/Source/cmake/WebKitFeatures.cmake
index f747dc8..bf45f23 100644 (file)
--- a/Source/cmake/WebKitFeatures.cmake
+++ b/Source/cmake/WebKitFeatures.cmake
@@ -41,6 +41,7 @@ macro(WEBKIT_OPTION_BEGIN)
     WEBKIT_OPTION_DEFINE(ENABLE_ES6_CLASS_SYNTAX "Toggle ES6 class syntax support" ON)
     WEBKIT_OPTION_DEFINE(ENABLE_CONTENT_FILTERING "Toggle content filtering support" OFF)
     WEBKIT_OPTION_DEFINE(ENABLE_CONTEXT_MENUS "Toggle Context Menu support" ON)
     WEBKIT_OPTION_DEFINE(ENABLE_ES6_CLASS_SYNTAX "Toggle ES6 class syntax support" ON)
     WEBKIT_OPTION_DEFINE(ENABLE_CONTENT_FILTERING "Toggle content filtering support" OFF)
     WEBKIT_OPTION_DEFINE(ENABLE_CONTEXT_MENUS "Toggle Context Menu support" ON)

+    WEBKIT_OPTION_DEFINE(ENABLE_CREDENTIAL_STORAGE "Toggle Credential Storage support" OFF)

     WEBKIT_OPTION_DEFINE(ENABLE_CSP_NEXT "Toggle Content Security Policy 1.1 support" OFF)
     WEBKIT_OPTION_DEFINE(ENABLE_CSS3_TEXT "Toggle CSS3 Text support" OFF)
     WEBKIT_OPTION_DEFINE(ENABLE_CSS3_TEXT_LINE_BREAK "Toggle CSS3 Text Line Break support" OFF)
     WEBKIT_OPTION_DEFINE(ENABLE_CSP_NEXT "Toggle Content Security Policy 1.1 support" OFF)
     WEBKIT_OPTION_DEFINE(ENABLE_CSS3_TEXT "Toggle CSS3 Text support" OFF)
     WEBKIT_OPTION_DEFINE(ENABLE_CSS3_TEXT_LINE_BREAK "Toggle CSS3 Text Line Break support" OFF)


@@ -52,8 +53,8 @@ macro(WEBKIT_OPTION_BEGIN)
     WEBKIT_OPTION_DEFINE(ENABLE_CSS_IMAGE_RESOLUTION "Toggle CSS image-resolution support" OFF)
     WEBKIT_OPTION_DEFINE(ENABLE_CSS_IMAGE_SET "Toggle CSS image-set support" OFF)
     WEBKIT_OPTION_DEFINE(ENABLE_CSS_REGIONS "Toggle CSS regions support" OFF)
     WEBKIT_OPTION_DEFINE(ENABLE_CSS_IMAGE_RESOLUTION "Toggle CSS image-resolution support" OFF)
     WEBKIT_OPTION_DEFINE(ENABLE_CSS_IMAGE_SET "Toggle CSS image-set support" OFF)
     WEBKIT_OPTION_DEFINE(ENABLE_CSS_REGIONS "Toggle CSS regions support" OFF)

-    WEBKIT_OPTION_DEFINE(ENABLE_CSS_SELECTORS_LEVEL4 "Toggle CSS Selectors Level 4 support" OFF)

     WEBKIT_OPTION_DEFINE(ENABLE_CSS_SCROLL_SNAP "Toggle CSS snap scroll support" OFF)
     WEBKIT_OPTION_DEFINE(ENABLE_CSS_SCROLL_SNAP "Toggle CSS snap scroll support" OFF)

+    WEBKIT_OPTION_DEFINE(ENABLE_CSS_SELECTORS_LEVEL4 "Toggle CSS Selectors Level 4 support" OFF)

     WEBKIT_OPTION_DEFINE(ENABLE_CSS_SHAPES "Toggle CSS Shapes support" OFF)
     WEBKIT_OPTION_DEFINE(ENABLE_CURSOR_VISIBILITY "Toggle cursor visibility support" OFF)
     WEBKIT_OPTION_DEFINE(ENABLE_CUSTOM_SCHEME_HANDLER "Toggle Custom Scheme Handler support" OFF)
     WEBKIT_OPTION_DEFINE(ENABLE_CSS_SHAPES "Toggle CSS Shapes support" OFF)
     WEBKIT_OPTION_DEFINE(ENABLE_CURSOR_VISIBILITY "Toggle cursor visibility support" OFF)
     WEBKIT_OPTION_DEFINE(ENABLE_CUSTOM_SCHEME_HANDLER "Toggle Custom Scheme Handler support" OFF)


@@ -70,8 +71,8 @@ macro(WEBKIT_OPTION_BEGIN)
     WEBKIT_OPTION_DEFINE(ENABLE_ENCRYPTED_MEDIA_V2 "Support EME v2" OFF)
     WEBKIT_OPTION_DEFINE(ENABLE_FILTERS_LEVEL_2 "Toggle Filters Module Level 2" OFF)
     WEBKIT_OPTION_DEFINE(ENABLE_FONT_LOAD_EVENTS "Toggle Font Load Events support" OFF)
     WEBKIT_OPTION_DEFINE(ENABLE_ENCRYPTED_MEDIA_V2 "Support EME v2" OFF)
     WEBKIT_OPTION_DEFINE(ENABLE_FILTERS_LEVEL_2 "Toggle Filters Module Level 2" OFF)
     WEBKIT_OPTION_DEFINE(ENABLE_FONT_LOAD_EVENTS "Toggle Font Load Events support" OFF)

-    WEBKIT_OPTION_DEFINE(ENABLE_FTL_JIT "Toggle FTL support for JSC" OFF)

     WEBKIT_OPTION_DEFINE(ENABLE_FTPDIR "Toggle FTP directory support" ON)
     WEBKIT_OPTION_DEFINE(ENABLE_FTPDIR "Toggle FTP directory support" ON)

+    WEBKIT_OPTION_DEFINE(ENABLE_FTL_JIT "Toggle FTL support for JSC" OFF)

     WEBKIT_OPTION_DEFINE(ENABLE_FULLSCREEN_API "Toggle Fullscreen API support" OFF)
     WEBKIT_OPTION_DEFINE(ENABLE_GAMEPAD "Toggle Gamepad support" OFF)
     WEBKIT_OPTION_DEFINE(ENABLE_GAMEPAD_DEPRECATED "Toggle deprecated Gamepad support" OFF)
     WEBKIT_OPTION_DEFINE(ENABLE_FULLSCREEN_API "Toggle Fullscreen API support" OFF)
     WEBKIT_OPTION_DEFINE(ENABLE_GAMEPAD "Toggle Gamepad support" OFF)
     WEBKIT_OPTION_DEFINE(ENABLE_GAMEPAD_DEPRECATED "Toggle deprecated Gamepad support" OFF)


@@ -151,12 +152,12 @@ macro(WEBKIT_OPTION_BEGIN)
     WEBKIT_OPTION_DEFINE(ENABLE_VIDEO "Toggle Video support" OFF)
     WEBKIT_OPTION_DEFINE(ENABLE_VIDEO_TRACK "Toggle Track support for HTML5 video" OFF)
     WEBKIT_OPTION_DEFINE(ENABLE_VIEW_MODE_CSS_MEDIA "Toggle Track support for the view-mode media Feature" ON)
     WEBKIT_OPTION_DEFINE(ENABLE_VIDEO "Toggle Video support" OFF)
     WEBKIT_OPTION_DEFINE(ENABLE_VIDEO_TRACK "Toggle Track support for HTML5 video" OFF)
     WEBKIT_OPTION_DEFINE(ENABLE_VIEW_MODE_CSS_MEDIA "Toggle Track support for the view-mode media Feature" ON)

+    WEBKIT_OPTION_DEFINE(ENABLE_WEBGL "Toggle 3D canvas (WebGL) support" OFF)
+    WEBKIT_OPTION_DEFINE(ENABLE_WEBVTT_REGIONS "Toggle webvtt region support" OFF)

     WEBKIT_OPTION_DEFINE(ENABLE_WEB_AUDIO "Toggle Web Audio support" OFF)
     WEBKIT_OPTION_DEFINE(ENABLE_WEB_REPLAY "Toggle Web Replay support" OFF)
     WEBKIT_OPTION_DEFINE(ENABLE_WEB_SOCKETS "Toggle Web Sockets support" ON)
     WEBKIT_OPTION_DEFINE(ENABLE_WEB_TIMING "Toggle Web Timing support" OFF)
     WEBKIT_OPTION_DEFINE(ENABLE_WEB_AUDIO "Toggle Web Audio support" OFF)
     WEBKIT_OPTION_DEFINE(ENABLE_WEB_REPLAY "Toggle Web Replay support" OFF)
     WEBKIT_OPTION_DEFINE(ENABLE_WEB_SOCKETS "Toggle Web Sockets support" ON)
     WEBKIT_OPTION_DEFINE(ENABLE_WEB_TIMING "Toggle Web Timing support" OFF)

-    WEBKIT_OPTION_DEFINE(ENABLE_WEBGL "Toggle 3D canvas (WebGL) support" OFF)
-    WEBKIT_OPTION_DEFINE(ENABLE_WEBVTT_REGIONS "Toggle webvtt region support" OFF)

     WEBKIT_OPTION_DEFINE(ENABLE_XHR_TIMEOUT "Toggle XHR timeout support" OFF)
     WEBKIT_OPTION_DEFINE(ENABLE_XSLT "Toggle XSLT support" ON)
     WEBKIT_OPTION_DEFINE(USE_SYSTEM_MALLOC "Toggle system allocator instead of WebKit's custom allocator" OFF)
     WEBKIT_OPTION_DEFINE(ENABLE_XHR_TIMEOUT "Toggle XHR timeout support" OFF)
     WEBKIT_OPTION_DEFINE(ENABLE_XSLT "Toggle XSLT support" ON)
     WEBKIT_OPTION_DEFINE(USE_SYSTEM_MALLOC "Toggle system allocator instead of WebKit's custom allocator" OFF)

diff --git a/Source/cmakeconfig.h.cmake b/Source/cmakeconfig.h.cmake
index 5e983d5..877ef5c 100644 (file)
--- a/Source/cmakeconfig.h.cmake
+++ b/Source/cmakeconfig.h.cmake
@@ -4,6 +4,7 @@
 #cmakedefine01 ENABLE_3D_RENDERING
 #cmakedefine01 ENABLE_ACCELERATED_2D_CANVAS
 #cmakedefine01 ENABLE_ACCELERATED_OVERFLOW_SCROLLING
 #cmakedefine01 ENABLE_3D_RENDERING
 #cmakedefine01 ENABLE_ACCELERATED_2D_CANVAS
 #cmakedefine01 ENABLE_ACCELERATED_OVERFLOW_SCROLLING

+#cmakedefine01 ENABLE_ACCESSIBILITY

 #cmakedefine01 ENABLE_API_TESTS
 #cmakedefine01 ENABLE_ATTACHMENT_ELEMENT
 #cmakedefine01 ENABLE_AVF_CAPTIONS
 #cmakedefine01 ENABLE_API_TESTS
 #cmakedefine01 ENABLE_ATTACHMENT_ELEMENT
 #cmakedefine01 ENABLE_AVF_CAPTIONS


@@ -21,8 +22,8 @@
 #cmakedefine01 ENABLE_CSS3_TEXT
 #cmakedefine01 ENABLE_CSS3_TEXT_LINE_BREAK
 #cmakedefine01 ENABLE_CSS_BOX_DECORATION_BREAK
 #cmakedefine01 ENABLE_CSS3_TEXT
 #cmakedefine01 ENABLE_CSS3_TEXT_LINE_BREAK
 #cmakedefine01 ENABLE_CSS_BOX_DECORATION_BREAK

-#cmakedefine01 ENABLE_CSS_DEVICE_ADAPTATION

 #cmakedefine01 ENABLE_CSS_COMPOSITING
 #cmakedefine01 ENABLE_CSS_COMPOSITING

+#cmakedefine01 ENABLE_CSS_DEVICE_ADAPTATION

 #cmakedefine01 ENABLE_CSS_GRID_LAYOUT
 #cmakedefine01 ENABLE_CSS_IMAGE_ORIENTATION
 #cmakedefine01 ENABLE_CSS_IMAGE_RESOLUTION
 #cmakedefine01 ENABLE_CSS_GRID_LAYOUT
 #cmakedefine01 ENABLE_CSS_IMAGE_ORIENTATION
 #cmakedefine01 ENABLE_CSS_IMAGE_RESOLUTION


@@ -44,13 +45,11 @@
 #cmakedefine01 ENABLE_DRAG_SUPPORT
 #cmakedefine01 ENABLE_ENCRYPTED_MEDIA
 #cmakedefine01 ENABLE_ENCRYPTED_MEDIA_V2
 #cmakedefine01 ENABLE_DRAG_SUPPORT
 #cmakedefine01 ENABLE_ENCRYPTED_MEDIA
 #cmakedefine01 ENABLE_ENCRYPTED_MEDIA_V2

-#cmakedefine01 ENABLE_EVENT_MODE_METATAGS

 #cmakedefine01 ENABLE_FILTERS_LEVEL_2
 #cmakedefine01 ENABLE_FILTERS_LEVEL_2

-#cmakedefine01 ENABLE_FIXED_REPORTED_SIZE
+#cmakedefine01 ENABLE_FONT_LOAD_EVENTS

 #cmakedefine01 ENABLE_FTPDIR
 #cmakedefine01 ENABLE_FTL_JIT
 #cmakedefine01 ENABLE_FTL_NATIVE_CALL_INLINING
 #cmakedefine01 ENABLE_FTPDIR
 #cmakedefine01 ENABLE_FTL_JIT
 #cmakedefine01 ENABLE_FTL_NATIVE_CALL_INLINING

-#cmakedefine01 ENABLE_FONT_LOAD_EVENTS

 #cmakedefine01 ENABLE_FULLSCREEN_API
 #cmakedefine01 ENABLE_GAMEPAD
 #cmakedefine01 ENABLE_GAMEPAD_DEPRECATED
 #cmakedefine01 ENABLE_FULLSCREEN_API
 #cmakedefine01 ENABLE_GAMEPAD
 #cmakedefine01 ENABLE_GAMEPAD_DEPRECATED


@@ -78,6 +77,7 @@
 #cmakedefine01 ENABLE_LEGACY_WEB_AUDIO
 #cmakedefine01 ENABLE_LINK_PREFETCH
 #cmakedefine01 ENABLE_LLINT_C_LOOP
 #cmakedefine01 ENABLE_LEGACY_WEB_AUDIO
 #cmakedefine01 ENABLE_LINK_PREFETCH
 #cmakedefine01 ENABLE_LLINT_C_LOOP

+#cmakedefine01 ENABLE_MAC_LONG_PRESS

 #cmakedefine01 ENABLE_MATHML
 #cmakedefine01 ENABLE_MEDIA_CAPTURE
 #cmakedefine01 ENABLE_MEDIA_CONTROLS_SCRIPT
 #cmakedefine01 ENABLE_MATHML
 #cmakedefine01 ENABLE_MEDIA_CAPTURE
 #cmakedefine01 ENABLE_MEDIA_CONTROLS_SCRIPT


@@ -108,9 +108,9 @@
 #cmakedefine01 ENABLE_REQUEST_ANIMATION_FRAME
 #cmakedefine01 ENABLE_RESOLUTION_MEDIA_QUERY
 #cmakedefine01 ENABLE_RESOURCE_TIMING
 #cmakedefine01 ENABLE_REQUEST_ANIMATION_FRAME
 #cmakedefine01 ENABLE_RESOLUTION_MEDIA_QUERY
 #cmakedefine01 ENABLE_RESOURCE_TIMING

+#cmakedefine01 ENABLE_SATURATED_LAYOUT_ARITHMETIC

 #cmakedefine01 ENABLE_SECCOMP_FILTERS
 #cmakedefine01 ENABLE_SERVICE_CONTROLS
 #cmakedefine01 ENABLE_SECCOMP_FILTERS
 #cmakedefine01 ENABLE_SERVICE_CONTROLS

-#cmakedefine01 ENABLE_SATURATED_LAYOUT_ARITHMETIC

 #cmakedefine01 ENABLE_SMOOTH_SCROLLING
 #cmakedefine01 ENABLE_SPELLCHECK
 #cmakedefine01 ENABLE_STREAMS_API
 #cmakedefine01 ENABLE_SMOOTH_SCROLLING
 #cmakedefine01 ENABLE_SPELLCHECK
 #cmakedefine01 ENABLE_STREAMS_API


@@ -128,11 +128,10 @@
 #cmakedefine01 ENABLE_VIBRATION
 #cmakedefine01 ENABLE_VIDEO
 #cmakedefine01 ENABLE_VIDEO_TRACK
 #cmakedefine01 ENABLE_VIBRATION
 #cmakedefine01 ENABLE_VIDEO
 #cmakedefine01 ENABLE_VIDEO_TRACK

-#cmakedefine01 ENABLE_VIEWPORT_REFLOW

 #cmakedefine01 ENABLE_VIEW_MODE_CSS_MEDIA
 #cmakedefine01 ENABLE_WEBGL
 #cmakedefine01 ENABLE_VIEW_MODE_CSS_MEDIA
 #cmakedefine01 ENABLE_WEBGL

-#cmakedefine01 ENABLE_WEB_AUDIO

 #cmakedefine01 ENABLE_WEBVTT_REGIONS
 #cmakedefine01 ENABLE_WEBVTT_REGIONS

+#cmakedefine01 ENABLE_WEB_AUDIO

 #cmakedefine01 ENABLE_WEB_REPLAY
 #cmakedefine01 ENABLE_WEB_SOCKETS
 #cmakedefine01 ENABLE_WEB_TIMING
 #cmakedefine01 ENABLE_WEB_REPLAY
 #cmakedefine01 ENABLE_WEB_SOCKETS
 #cmakedefine01 ENABLE_WEB_TIMING