Changeset 182996 in webkit


Ignore:
Timestamp:
Apr 19, 2015 6:28:34 PM (9 years ago)
Author:
Gyuyoung Kim
Message:

[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:
Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/ChangeLog

    r182993 r182996  
     12015-04-19  Gyuyoung Kim  <gyuyoung.kim@webkit.org>
     2
     3        [CMake] Synchronize variables between WebKitFeatures.cmake and cmakedonfig.h.cmake
     4        https://bugs.webkit.org/show_bug.cgi?id=143935
     5
     6        Reviewed by Darin Adler.
     7
     8        Some variables aren't defined in these files or unused variables aren't removed. This
     9        patch cleans up it as well as fix wrong alphabet order.
     10
     11        * Source/cmake/WebKitFeatures.cmake:
     12        * Source/cmakeconfig.h.cmake:
     13
    1142015-04-19  Simon Fraser  <simon.fraser@apple.com>
    215
  • trunk/Source/cmake/WebKitFeatures.cmake

    r182740 r182996  
    4242    WEBKIT_OPTION_DEFINE(ENABLE_CONTENT_FILTERING "Toggle content filtering support" OFF)
    4343    WEBKIT_OPTION_DEFINE(ENABLE_CONTEXT_MENUS "Toggle Context Menu support" ON)
     44    WEBKIT_OPTION_DEFINE(ENABLE_CREDENTIAL_STORAGE "Toggle Credential Storage support" OFF)
    4445    WEBKIT_OPTION_DEFINE(ENABLE_CSP_NEXT "Toggle Content Security Policy 1.1 support" OFF)
    4546    WEBKIT_OPTION_DEFINE(ENABLE_CSS3_TEXT "Toggle CSS3 Text support" OFF)
     
    5354    WEBKIT_OPTION_DEFINE(ENABLE_CSS_IMAGE_SET "Toggle CSS image-set support" OFF)
    5455    WEBKIT_OPTION_DEFINE(ENABLE_CSS_REGIONS "Toggle CSS regions support" OFF)
     56    WEBKIT_OPTION_DEFINE(ENABLE_CSS_SCROLL_SNAP "Toggle CSS snap scroll support" OFF)
    5557    WEBKIT_OPTION_DEFINE(ENABLE_CSS_SELECTORS_LEVEL4 "Toggle CSS Selectors Level 4 support" OFF)
    56     WEBKIT_OPTION_DEFINE(ENABLE_CSS_SCROLL_SNAP "Toggle CSS snap scroll support" OFF)
    5758    WEBKIT_OPTION_DEFINE(ENABLE_CSS_SHAPES "Toggle CSS Shapes support" OFF)
    5859    WEBKIT_OPTION_DEFINE(ENABLE_CURSOR_VISIBILITY "Toggle cursor visibility support" OFF)
     
    7172    WEBKIT_OPTION_DEFINE(ENABLE_FILTERS_LEVEL_2 "Toggle Filters Module Level 2" OFF)
    7273    WEBKIT_OPTION_DEFINE(ENABLE_FONT_LOAD_EVENTS "Toggle Font Load Events support" OFF)
     74    WEBKIT_OPTION_DEFINE(ENABLE_FTPDIR "Toggle FTP directory support" ON)
    7375    WEBKIT_OPTION_DEFINE(ENABLE_FTL_JIT "Toggle FTL support for JSC" OFF)
    74     WEBKIT_OPTION_DEFINE(ENABLE_FTPDIR "Toggle FTP directory support" ON)
    7576    WEBKIT_OPTION_DEFINE(ENABLE_FULLSCREEN_API "Toggle Fullscreen API support" OFF)
    7677    WEBKIT_OPTION_DEFINE(ENABLE_GAMEPAD "Toggle Gamepad support" OFF)
     
    152153    WEBKIT_OPTION_DEFINE(ENABLE_VIDEO_TRACK "Toggle Track support for HTML5 video" OFF)
    153154    WEBKIT_OPTION_DEFINE(ENABLE_VIEW_MODE_CSS_MEDIA "Toggle Track support for the view-mode media Feature" ON)
     155    WEBKIT_OPTION_DEFINE(ENABLE_WEBGL "Toggle 3D canvas (WebGL) support" OFF)
     156    WEBKIT_OPTION_DEFINE(ENABLE_WEBVTT_REGIONS "Toggle webvtt region support" OFF)
    154157    WEBKIT_OPTION_DEFINE(ENABLE_WEB_AUDIO "Toggle Web Audio support" OFF)
    155158    WEBKIT_OPTION_DEFINE(ENABLE_WEB_REPLAY "Toggle Web Replay support" OFF)
    156159    WEBKIT_OPTION_DEFINE(ENABLE_WEB_SOCKETS "Toggle Web Sockets support" ON)
    157160    WEBKIT_OPTION_DEFINE(ENABLE_WEB_TIMING "Toggle Web Timing support" OFF)
    158     WEBKIT_OPTION_DEFINE(ENABLE_WEBGL "Toggle 3D canvas (WebGL) support" OFF)
    159     WEBKIT_OPTION_DEFINE(ENABLE_WEBVTT_REGIONS "Toggle webvtt region support" OFF)
    160161    WEBKIT_OPTION_DEFINE(ENABLE_XHR_TIMEOUT "Toggle XHR timeout support" OFF)
    161162    WEBKIT_OPTION_DEFINE(ENABLE_XSLT "Toggle XSLT support" ON)
  • trunk/Source/cmakeconfig.h.cmake

    r182731 r182996  
    55#cmakedefine01 ENABLE_ACCELERATED_2D_CANVAS
    66#cmakedefine01 ENABLE_ACCELERATED_OVERFLOW_SCROLLING
     7#cmakedefine01 ENABLE_ACCESSIBILITY
    78#cmakedefine01 ENABLE_API_TESTS
    89#cmakedefine01 ENABLE_ATTACHMENT_ELEMENT
     
    2223#cmakedefine01 ENABLE_CSS3_TEXT_LINE_BREAK
    2324#cmakedefine01 ENABLE_CSS_BOX_DECORATION_BREAK
     25#cmakedefine01 ENABLE_CSS_COMPOSITING
    2426#cmakedefine01 ENABLE_CSS_DEVICE_ADAPTATION
    25 #cmakedefine01 ENABLE_CSS_COMPOSITING
    2627#cmakedefine01 ENABLE_CSS_GRID_LAYOUT
    2728#cmakedefine01 ENABLE_CSS_IMAGE_ORIENTATION
     
    4546#cmakedefine01 ENABLE_ENCRYPTED_MEDIA
    4647#cmakedefine01 ENABLE_ENCRYPTED_MEDIA_V2
    47 #cmakedefine01 ENABLE_EVENT_MODE_METATAGS
    4848#cmakedefine01 ENABLE_FILTERS_LEVEL_2
    49 #cmakedefine01 ENABLE_FIXED_REPORTED_SIZE
     49#cmakedefine01 ENABLE_FONT_LOAD_EVENTS
    5050#cmakedefine01 ENABLE_FTPDIR
    5151#cmakedefine01 ENABLE_FTL_JIT
    5252#cmakedefine01 ENABLE_FTL_NATIVE_CALL_INLINING
    53 #cmakedefine01 ENABLE_FONT_LOAD_EVENTS
    5453#cmakedefine01 ENABLE_FULLSCREEN_API
    5554#cmakedefine01 ENABLE_GAMEPAD
     
    7978#cmakedefine01 ENABLE_LINK_PREFETCH
    8079#cmakedefine01 ENABLE_LLINT_C_LOOP
     80#cmakedefine01 ENABLE_MAC_LONG_PRESS
    8181#cmakedefine01 ENABLE_MATHML
    8282#cmakedefine01 ENABLE_MEDIA_CAPTURE
     
    109109#cmakedefine01 ENABLE_RESOLUTION_MEDIA_QUERY
    110110#cmakedefine01 ENABLE_RESOURCE_TIMING
     111#cmakedefine01 ENABLE_SATURATED_LAYOUT_ARITHMETIC
    111112#cmakedefine01 ENABLE_SECCOMP_FILTERS
    112113#cmakedefine01 ENABLE_SERVICE_CONTROLS
    113 #cmakedefine01 ENABLE_SATURATED_LAYOUT_ARITHMETIC
    114114#cmakedefine01 ENABLE_SMOOTH_SCROLLING
    115115#cmakedefine01 ENABLE_SPELLCHECK
     
    129129#cmakedefine01 ENABLE_VIDEO
    130130#cmakedefine01 ENABLE_VIDEO_TRACK
    131 #cmakedefine01 ENABLE_VIEWPORT_REFLOW
    132131#cmakedefine01 ENABLE_VIEW_MODE_CSS_MEDIA
    133132#cmakedefine01 ENABLE_WEBGL
     133#cmakedefine01 ENABLE_WEBVTT_REGIONS
    134134#cmakedefine01 ENABLE_WEB_AUDIO
    135 #cmakedefine01 ENABLE_WEBVTT_REGIONS
    136135#cmakedefine01 ENABLE_WEB_REPLAY
    137136#cmakedefine01 ENABLE_WEB_SOCKETS
Note: See TracChangeset for help on using the changeset viewer.