Changeset 172346 in webkit


Ignore:
Timestamp:
Aug 8, 2014, 11:13:54 AM (10 years ago)
Author:
achristensen@apple.com
Message:

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.

Location:
trunk
Files:
16 edited

Legend:

Unmodified
Added
Removed

  • trunk/CMakeLists.txt

    r172340 r172346  
    5656# -----------------------------------------------------------------------------
    5757find_package(BISON 2.3 REQUIRED)
    58 find_package(FLEX 2.5.34 REQUIRED)
     58if (!APPLE)
     59    find_package(FLEX 2.5.34 REQUIRED)
     60endif ()
    5961
    6062# TODO Enforce version requirement for gperf

  • trunk/ChangeLog

    r172345 r172346  
     12014-08-08  Alex Christensen  <achristensen@webkit.org>
     2
     3        Progress towards using CMake on Mac.
     4        https://bugs.webkit.org/show_bug.cgi?id=135662
     5
     6        Reviewed by Laszlo Gombos.
     7
     8        * CMakeLists.txt:
     9        Mavericks has a flex version of "flex 2.5.35 Apple(flex-31)" which CMake doesn't like on Mac.
     10        * Source/cmake/WebKitFeatures.cmake:
     11        * Source/cmakeconfig.h.cmake:
     12        Added features that are needed by the Mac port.
     13        * Source/cmake/OptionsMac.cmake:
     14        Enable CSS_IMAGE_SET based on FeatureDefines.h.
     15        Disable the FTL with CMake for now.
     16        * Source/cmake/OptionsEFL.cmake:
     17        * Source/cmake/OptionsGTK.cmake:
     18        Enable subpixel layout to not conflict with FeatureDefines.h
     19
    1202014-08-08  Simon Fraser  <simon.fraser@apple.com>
    221

  • trunk/Source/WebCore/CMakeLists.txt

    r172340 r172346  
    11set(WebCore_INCLUDE_DIRECTORIES
    22    "${WEBCORE_DIR}"
     3    "${WEBCORE_DIR}/Modules/airplay"
    34    "${WEBCORE_DIR}/Modules/battery"
    45    "${WEBCORE_DIR}/Modules/encryptedmedia"
    … …  
    3132    "${WEBCORE_DIR}/crypto"
    3233    "${WEBCORE_DIR}/crypto/keys"
     34    "${WEBCORE_DIR}/crypto/parameters"
    3335    "${WEBCORE_DIR}/css"
    3436    "${WEBCORE_DIR}/cssjit"
    … …  
    128130
    129131set(WebCore_IDL_INCLUDES
     132    Modules/airplay
    130133    Modules/battery
    131134    Modules/encryptedmedia
    … …  
    164167
    165168set(WebCore_IDL_FILES
     169    Modules/airplay/WebKitPlaybackTargetAvailabilityEvent.idl
     170
    166171    Modules/battery/BatteryManager.idl
    167172    Modules/battery/NavigatorBattery.idl
    … …  
    198203    Modules/indexeddb/IDBVersionChangeEvent.idl
    199204    Modules/indexeddb/WorkerGlobalScopeIndexedDatabase.idl
     205
     206    Modules/indieui/UIRequestEvent.idl
    200207
    201208    Modules/mediacontrols/MediaControlsHost.idl
    … …  
    784791
    785792set(WebCore_SOURCES
     793    Modules/airplay/WebKitPlaybackTargetAvailabilityEvent.cpp
     794
    786795    Modules/battery/BatteryController.cpp
    787796    Modules/battery/BatteryManager.cpp
    … …  
    20852094    platform/graphics/ImageBuffer.cpp
    20862095    platform/graphics/ImageOrientation.cpp
    2087     platform/graphics/ImageSource.cpp
    20882096    platform/graphics/IntPoint.cpp
    20892097    platform/graphics/IntRect.cpp
    … …  
    21592167    platform/graphics/transforms/TransformationMatrix.cpp
    21602168    platform/graphics/transforms/TranslateTransformOperation.cpp
    2161 
    2162     platform/image-decoders/ImageDecoder.cpp
    2163 
    2164     platform/image-decoders/bmp/BMPImageDecoder.cpp
    2165     platform/image-decoders/bmp/BMPImageReader.cpp
    2166 
    2167     platform/image-decoders/gif/GIFImageDecoder.cpp
    2168     platform/image-decoders/gif/GIFImageReader.cpp
    2169 
    2170     platform/image-decoders/ico/ICOImageDecoder.cpp
    2171 
    2172     platform/image-decoders/jpeg/JPEGImageDecoder.cpp
    2173 
    2174     platform/image-decoders/png/PNGImageDecoder.cpp
    2175 
    2176     platform/image-decoders/webp/WEBPImageDecoder.cpp
    21772169
    21782170    platform/leveldb/LevelDBDatabase.cpp

  • trunk/Source/WebCore/ChangeLog

    r172340 r172346  
     12014-08-08  Alex Christensen  <achristensen@webkit.org>
     2
     3        Progress towards using CMake on Mac.
     4        https://bugs.webkit.org/show_bug.cgi?id=135662
     5
     6        Reviewed by Laszlo Gombos.
     7
     8        * CMakeLists.txt:
     9        Added necessary include directories and idls.
     10        * PlatformEfl.cmake:
     11        * PlatformGTK.cmake:
     12        Moved ImageSource.cpp and image-decoders to platform CMake files because they are not used on mac.
     13        * PlatformMac.cmake:
     14        Corrected some sources.
     15        * config.h:
     16        Added workaround for not using prefix headers with CMake.
     17        * platform/graphics/ANGLEWebKitBridge.h:
     18        Compile fix to find ANGLE headers while using CMake.
     19        * platform/graphics/FormatConverter.h:
     20        * platform/mac/NSScrollerImpDetails.h:
     21        Removed unnecessary config.h includes.
     22
    1232014-08-08  Zan Dobersek  <zdobersek@igalia.com>
    224

  • trunk/Source/WebCore/PlatformEfl.cmake

    r172325 r172346  
    102102    platform/geoclue/GeolocationProviderGeoclue2.cpp
    103103
     104    platform/graphics/ImageSource.cpp
    104105    platform/graphics/WOFFFileFormat.cpp
    105106
    … …  
    166167    platform/graphics/texmap/coordinated/UpdateAtlas.cpp
    167168
     169    platform/image-decoders/ImageDecoder.cpp
     170
     171    platform/image-decoders/bmp/BMPImageDecoder.cpp
     172    platform/image-decoders/bmp/BMPImageReader.cpp
     173
    168174    platform/image-decoders/cairo/ImageDecoderCairo.cpp
     175
     176    platform/image-decoders/gif/GIFImageDecoder.cpp
     177    platform/image-decoders/gif/GIFImageReader.cpp
     178
     179    platform/image-decoders/ico/ICOImageDecoder.cpp
     180
     181    platform/image-decoders/jpeg/JPEGImageDecoder.cpp
     182
     183    platform/image-decoders/png/PNGImageDecoder.cpp
     184
     185    platform/image-decoders/webp/WEBPImageDecoder.cpp
    169186
    170187    platform/linux/GamepadDeviceLinux.cpp

  • trunk/Source/WebCore/PlatformGTK.cmake

    r172144 r172346  
    4242
    4343    platform/graphics/GraphicsContext3DPrivate.cpp
     44    platform/graphics/ImageSource.cpp
    4445    platform/graphics/OpenGLShims.cpp
    4546    platform/graphics/WOFFFileFormat.cpp
    … …  
    101102    platform/gtk/GamepadsGtk.cpp
    102103
     104    platform/image-decoders/ImageDecoder.cpp
     105
    103106    platform/image-decoders/cairo/ImageDecoderCairo.cpp
     107
     108    platform/image-decoders/gif/GIFImageDecoder.cpp
     109    platform/image-decoders/gif/GIFImageReader.cpp
     110
     111    platform/image-decoders/ico/ICOImageDecoder.cpp
     112
     113    platform/image-decoders/jpeg/JPEGImageDecoder.cpp
     114
     115    platform/image-decoders/bmp/BMPImageDecoder.cpp
     116    platform/image-decoders/bmp/BMPImageReader.cpp
     117
     118    platform/image-decoders/png/PNGImageDecoder.cpp
     119
     120    platform/image-decoders/webp/WEBPImageDecoder.cpp
    104121
    105122    platform/linux/GamepadDeviceLinux.cpp

  • trunk/Source/WebCore/PlatformMac.cmake

    r172093 r172346  
    11list(APPEND WebCore_INCLUDE_DIRECTORIES
    22    "${WEBCORE_DIR}/accessibility/mac"
     3    "${WEBCORE_DIR}/bridge/objc"
     4    "${WEBCORE_DIR}/loader/archive/cf"
     5    "${WEBCORE_DIR}/loader/cf"
    36    "${WEBCORE_DIR}/page/cocoa"
    47    "${WEBCORE_DIR}/page/mac"
     8    "${WEBCORE_DIR}/platform/cf"
    59    "${WEBCORE_DIR}/platform/cocoa"
    610    "${WEBCORE_DIR}/platform/graphics/avfoundation"
    … …  
    1620    "${WEBCORE_DIR}/platform/network/cf"
    1721    "${WEBCORE_DIR}/platform/network/mac"
     22    "${WEBCORE_DIR}/platform/text/cf"
     23    "${WEBCORE_DIR}/platform/text/mac"
    1824    "${WEBCORE_DIR}/platform/mac"
    1925    "${WEBCORE_DIR}/plugins/mac"
    … …  
    2834    accessibility/mac/WebAccessibilityObjectWrapperBase.mm
    2935    accessibility/mac/WebAccessibilityObjectWrapperMac.mm
     36
     37    loader/archive/cf/LegacyWebArchive.cpp
     38    loader/archive/cf/LegacyWebArchiveMac.mm
     39
     40    loader/cf/ResourceLoaderCFNet.cpp
     41    loader/cf/SubresourceLoaderCF.cpp
    3042
    3143    page/cocoa/UserAgent.mm
    … …  
    4860    platform/graphics/avfoundation/InbandTextTrackPrivateAVF.cpp
    4961    platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp
    50 
    51     platform/graphics/avfoundation/cf/CDMSessionAVFoundationCF.cpp
    52     platform/graphics/avfoundation/cf/InbandTextTrackPrivateAVCF.cpp
    53     platform/graphics/avfoundation/cf/InbandTextTrackPrivateLegacyAVCF.cpp
    54     platform/graphics/avfoundation/cf/WebCoreAVCFResourceLoader.cpp
    5562
    5663    platform/graphics/avfoundation/objc/AudioTrackPrivateAVFObjC.mm
    … …  
    8491
    8592    platform/graphics/opentype/OpenTypeMathData.cpp
    86     platform/graphics/opentype/OpenTypeUtilities.cpp
    87     platform/graphics/opentype/OpenTypeVerticalData.cpp
    88 
    89     platform/graphics/win/DIBPixelData.cpp
    90     platform/graphics/win/GDIExtras.cpp
    91     platform/graphics/win/IconWin.cpp
    92     platform/graphics/win/ImageWin.cpp
    93     platform/graphics/win/IntPointWin.cpp
    94     platform/graphics/win/IntRectWin.cpp
    95     platform/graphics/win/IntSizeWin.cpp
    9693
    9794    platform/mac/BlockExceptions.mm
    … …  
    197194    platform/network/mac/WebCoreURLResponse.mm
    198195
     196    platform/text/cf/HyphenationCF.cpp
     197
     198    platform/text/mac/LocaleMac.mm
     199    platform/text/mac/TextBoundaries.mm
     200    platform/text/mac/TextBreakIteratorInternalICUMac.mm
     201    platform/text/mac/TextCodecMac.cpp
     202
    199203    plugins/mac/PluginPackageMac.cpp
    200204    plugins/mac/PluginViewMac.mm

  • trunk/Source/WebCore/config.h

    r166239 r172346  
    6161
    6262#endif /* OS(WINDOWS) */
     63
     64// Using CMake with Unix makefiles does not use prefix headers.
     65#if PLATFORM(MAC) && defined(BUILDING_WITH_CMAKE)
     66#include "WebCorePrefix.h"
     67#endif
    6368
    6469#ifdef __cplusplus

  • trunk/Source/WebCore/platform/graphics/ANGLEWebKitBridge.h

    r165676 r172346  
    3030#include <wtf/text/WTFString.h>
    3131
    32 #if !PLATFORM(GTK) && !PLATFORM(EFL) && !PLATFORM(WIN)
     32#if !PLATFORM(GTK) && !PLATFORM(EFL) && !PLATFORM(WIN) && !defined(BUILDING_WITH_CMAKE)
    3333#include "ANGLE/ShaderLang.h"
    3434#elif PLATFORM(WIN)

  • trunk/Source/WebCore/platform/graphics/FormatConverter.h

    r165676 r172346  
    2525 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    2626 */
    27 
    28 #include "config.h"
    2927
    3028#if USE(3D_GRAPHICS)

  • trunk/Source/WebCore/platform/mac/NSScrollerImpDetails.h

    r168049 r172346  
    2626#ifndef WebCore_NSScrollerImpDetails_h
    2727#define WebCore_NSScrollerImpDetails_h
    28 
    29 #include "config.h"
    3028
    3129// Public APIs not available on versions of Mac on which we build

  • trunk/Source/cmake/OptionsEfl.cmake

    r172023 r172346  
    9696WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SPEECH_SYNTHESIS OFF)
    9797WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SPELLCHECK ON)
     98WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SUBPIXEL_LAYOUT ON)
    9899WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_TEMPLATE_ELEMENT ON)
    99100WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_TOUCH_EVENTS ON)

  • trunk/Source/cmake/OptionsGTK.cmake

    r172205 r172346  
    138138WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SHARED_WORKERS ON)
    139139WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SPELLCHECK ON)
     140WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SUBPIXEL_LAYOUT ON)
    140141WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_TEMPLATE_ELEMENT ON)
    141142WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_TOUCH_EVENTS ON)

  • trunk/Source/cmake/OptionsMac.cmake

    r172316 r172346  
    2525WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_IMAGE_ORIENTATION OFF)
    2626WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_IMAGE_RESOLUTION OFF)
     27WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_IMAGE_SET ON)
    2728WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_REGIONS ON)
    2829WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_SHAPES ON)
    … …  
    206207WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_XSLT ON)
    207208
    208 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FTL_JIT ON)
    209 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FTL_JIT_macosx ON)
    210 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FTL_JIT_iphoneos ON)
     209# FIXME: These are turned off temporarily to get CMake working easier.
     210WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FTL_JIT OFF)
     211WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FTL_JIT_macosx OFF)
     212WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FTL_JIT_iphoneos OFF)
    211213WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FTL_JIT_iphonesimulator OFF)
    212214

  • trunk/Source/cmake/WebKitFeatures.cmake

    r172316 r172346  
    1818    WEBKIT_OPTION_DEFINE(ENABLE_3D_RENDERING "Toggle 3D rendering support" OFF)
    1919    WEBKIT_OPTION_DEFINE(ENABLE_ACCELERATED_2D_CANVAS "Toggle accelerated 2D canvas support" OFF)
     20    WEBKIT_OPTION_DEFINE(ENABLE_ACCELERATED_OVERFLOW_SCROLLING "Toggle accelerated scrolling support" OFF)
    2021    WEBKIT_OPTION_DEFINE(ENABLE_ACCESSIBILITY "Toggle accessibility support" OFF)
    2122    WEBKIT_OPTION_DEFINE(ENABLE_API_TESTS "Enable public API unit tests" OFF)
     23    WEBKIT_OPTION_DEFINE(ENABLE_AVF_CAPTIONS "Toggle AVFoundation caption support" OFF)
    2224    WEBKIT_OPTION_DEFINE(ENABLE_ASSEMBLER_WX_EXCLUSIVE "Toggle Assembler WX Exclusive support" OFF)
    2325    WEBKIT_OPTION_DEFINE(ENABLE_BATTERY_STATUS "Toggle battery status API support" OFF)
     26    WEBKIT_OPTION_DEFINE(ENABLE_CACHE_PARTITIONING "Toggle cache partitioning support" OFF)
    2427    WEBKIT_OPTION_DEFINE(ENABLE_CANVAS_PATH "Toggle Canvas Path support" ON)
    2528    WEBKIT_OPTION_DEFINE(ENABLE_CANVAS_PROXY "Toggle CanvasProxy support" OFF)
    2629    WEBKIT_OPTION_DEFINE(ENABLE_CHANNEL_MESSAGING "Toggle MessageChannel and MessagePort support" ON)
     30    WEBKIT_OPTION_DEFINE(ENABLE_CONTENT_FILTERING "Toggle content filtering support" OFF)
    2731    WEBKIT_OPTION_DEFINE(ENABLE_CONTEXT_MENUS "Toggle Context Menu support" ON)
    2832    WEBKIT_OPTION_DEFINE(ENABLE_CSP_NEXT "Toggle Content Security Policy 1.1 support" OFF)
    … …  
    4145    WEBKIT_OPTION_DEFINE(ENABLE_CSS_SELECTORS_LEVEL4 "Toggle CSS Selectors Level 4 support" OFF)
    4246    WEBKIT_OPTION_DEFINE(ENABLE_CSS_SHAPES "Toggle CSS Shapes support" OFF)
     47    WEBKIT_OPTION_DEFINE(ENABLE_CURSOR_VISIBILITY "Toggle cursor visibility support" OFF)
    4348    WEBKIT_OPTION_DEFINE(ENABLE_CUSTOM_SCHEME_HANDLER "Toggle Custom Scheme Handler support" OFF)
     49    WEBKIT_OPTION_DEFINE(ENABLE_DASHBOARD_SUPPORT "Toggle dashboard support" OFF)
     50    WEBKIT_OPTION_DEFINE(ENABLE_DATACUE_VALUE "Toggle datacue value support" OFF)
    4451    WEBKIT_OPTION_DEFINE(ENABLE_DATALIST_ELEMENT "Toggle HTML5 datalist support" OFF)
    4552    WEBKIT_OPTION_DEFINE(ENABLE_DATA_TRANSFER_ITEMS "Toggle HTML5 data transfer items support" OFF)
    … …  
    5360    WEBKIT_OPTION_DEFINE(ENABLE_FILTERS "Toggle SVG Filters support" OFF)
    5461    WEBKIT_OPTION_DEFINE(ENABLE_FONT_LOAD_EVENTS "Toggle Font Load Events support" OFF)
     62    WEBKIT_OPTION_DEFINE(ENABLE_FTL_JIT "Toggle FTL support for JSC" OFF)
    5563    WEBKIT_OPTION_DEFINE(ENABLE_FTPDIR "Toggle FTP directory support" ON)
    5664    WEBKIT_OPTION_DEFINE(ENABLE_FULLSCREEN_API "Toggle Fullscreen API support" OFF)
    … …  
    6371    WEBKIT_OPTION_DEFINE(ENABLE_IMAGE_DECODER_DOWN_SAMPLING "Toggle image decoder down sampling support" OFF)
    6472    WEBKIT_OPTION_DEFINE(ENABLE_INDEXED_DATABASE "Toggle Indexed Database API support" OFF)
     73    WEBKIT_OPTION_DEFINE(ENABLE_INDIE_UI "Toggle Indie UI support" OFF)
    6574    WEBKIT_OPTION_DEFINE(ENABLE_INPUT_TYPE_COLOR "Toggle Color Input support" OFF)
     75    WEBKIT_OPTION_DEFINE(ENABLE_INPUT_TYPE_COLOR_POPOVER "Toggle popover color input support" OFF)
    6676    WEBKIT_OPTION_DEFINE(ENABLE_INPUT_TYPE_DATE "Toggle date type <input> support" OFF)
    6777    WEBKIT_OPTION_DEFINE(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE "Toggle broken datetime type <input> support" OFF)
    … …  
    7181    WEBKIT_OPTION_DEFINE(ENABLE_INPUT_TYPE_WEEK "Toggle week type <input> support" OFF)
    7282    WEBKIT_OPTION_DEFINE(ENABLE_INSPECTOR "Toggle Web Inspector support" ON)
     83    WEBKIT_OPTION_DEFINE(ENABLE_IOS_AIRPLAY "Toggle iOS airplay support" OFF)
     84    WEBKIT_OPTION_DEFINE(ENABLE_IOS_TEXT_AUTOSIZING "Toggle iOS text autosizing support" OFF)
    7385    WEBKIT_OPTION_DEFINE(ENABLE_JIT "Enable JustInTime javascript support" ON)
     86    WEBKIT_OPTION_DEFINE(ENABLE_LEGACY_CSS_VENDOR_PREFIXES "Toggle legacy css vendor prefix support" OFF)
    7487    WEBKIT_OPTION_DEFINE(ENABLE_LEGACY_NOTIFICATIONS "Toggle Legacy Desktop Notifications Support" OFF)
    7588    WEBKIT_OPTION_DEFINE(ENABLE_LEGACY_VENDOR_PREFIXES "Toggle Legacy Vendor Prefix Support" ON)
    7689    WEBKIT_OPTION_DEFINE(ENABLE_LEGACY_WEB_AUDIO "Toggle Legacy Web Audio support" ON)
     90    WEBKIT_OPTION_DEFINE(ENABLE_LETTERPRESS "Toggle letterpress support" OFF)
    7791    WEBKIT_OPTION_DEFINE(ENABLE_LINK_PREFETCH "Toggle pre fetching support" OFF)
    7892    WEBKIT_OPTION_DEFINE(ENABLE_LLINT_C_LOOP "Force use of the llint c loop" OFF)
     93    WEBKIT_OPTION_DEFINE(ENABLE_MAC_LONG_PRESS "Toggle mac long press support" OFF)
    7994    WEBKIT_OPTION_DEFINE(ENABLE_MATHML "Toggle MathML support" ON)
    8095    WEBKIT_OPTION_DEFINE(ENABLE_MEDIA_CAPTURE "Toggle Media Capture support" OFF)
    … …  
    94109    WEBKIT_OPTION_DEFINE(ENABLE_NOTIFICATIONS "Toggle Desktop Notifications Support" OFF)
    95110    WEBKIT_OPTION_DEFINE(ENABLE_ORIENTATION_EVENTS "Toggle Orientation Events support" OFF)
     111    WEBKIT_OPTION_DEFINE(ENABLE_PDFKIT_PLUGIN "Toggle PDFKit plugin support" OFF)
    96112    WEBKIT_OPTION_DEFINE(ENABLE_PERFORMANCE_TIMELINE "Toggle Performance Timeline support" OFF)
    97113    WEBKIT_OPTION_DEFINE(ENABLE_PICTURE_SIZES "Toggle sizes attribute support" OFF)
     114    WEBKIT_OPTION_DEFINE(ENABLE_POINTER_LOCK "Toggle pointer lock support" OFF)
    98115    WEBKIT_OPTION_DEFINE(ENABLE_PROMISES "Toggle Promise support" ON)
    99116    WEBKIT_OPTION_DEFINE(ENABLE_PROXIMITY_EVENTS "Toggle Proximity Events support" OFF)
     117    WEBKIT_OPTION_DEFINE(ENABLE_PUBLIC_SUFFIX_LIST "Toggle public suffix list support" OFF)
    100118    WEBKIT_OPTION_DEFINE(ENABLE_QUOTA "Toggle Quota support" OFF)
     119    WEBKIT_OPTION_DEFINE(ENABLE_REMOTE_INSPECTOR "Toggle remote inspector support" OFF)
    101120    WEBKIT_OPTION_DEFINE(ENABLE_REQUEST_ANIMATION_FRAME "Toggle requestAnimationFrame support" OFF)
    102121    WEBKIT_OPTION_DEFINE(ENABLE_RESOLUTION_MEDIA_QUERY "Toggle resolution media query support" OFF)
    103122    WEBKIT_OPTION_DEFINE(ENABLE_RESOURCE_TIMING "Toggle Resource Timing support" OFF)
    104123    WEBKIT_OPTION_DEFINE(ENABLE_SECCOMP_FILTERS "Toggle Linux seccomp filters for the WebProcess support" OFF)
     124    WEBKIT_OPTION_DEFINE(ENABLE_SERVICE_CONTROLS "Toggle service controls support" OFF)
    105125    WEBKIT_OPTION_DEFINE(ENABLE_SHARED_WORKERS "Toggle SharedWorkers support" OFF)
    106126    WEBKIT_OPTION_DEFINE(ENABLE_SPEECH_SYNTHESIS "Toggle Speech Synthesis API support)" OFF)
    107127    WEBKIT_OPTION_DEFINE(ENABLE_SPELLCHECK "Toggle Spellchecking support (requires Enchant)" OFF)
    108128    WEBKIT_OPTION_DEFINE(ENABLE_SQL_DATABASE "Toggle SQL Database Support" ON)
     129    WEBKIT_OPTION_DEFINE(ENABLE_SUBPIXEL_LAYOUT "Toggle subpixel layout support" OFF)
     130    WEBKIT_OPTION_DEFINE(ENABLE_SUBTLE_CRYPTO "Toggle subtle crypto support" OFF)
    109131    WEBKIT_OPTION_DEFINE(ENABLE_SVG_FONTS "Toggle SVG fonts support (imples SVG support)" ON)
     132    WEBKIT_OPTION_DEFINE(ENABLE_TELEPHONE_NUMBER_DETECTION "Toggle telephone number detection support" OFF)
    110133    WEBKIT_OPTION_DEFINE(ENABLE_TEMPLATE_ELEMENT "Toggle Template support" ON)
    111134    WEBKIT_OPTION_DEFINE(ENABLE_TEXT_AUTOSIZING "Toggle Text auto sizing support" OFF)
    … …  
    124147    WEBKIT_OPTION_DEFINE(ENABLE_WEB_TIMING "Toggle Web Timing support" OFF)
    125148    WEBKIT_OPTION_DEFINE(ENABLE_WEBGL "Toggle 3D canvas (WebGL) support" OFF)
     149    WEBKIT_OPTION_DEFINE(ENABLE_WEBVTT_REGIONS "Toggle webvtt region support" OFF)
    126150    WEBKIT_OPTION_DEFINE(ENABLE_XHR_TIMEOUT "Toggle XHR timeout support" OFF)
    127151    WEBKIT_OPTION_DEFINE(ENABLE_XSLT "Toggle XSLT support" ON)

  • trunk/Source/cmakeconfig.h.cmake

    r172316 r172346  
    66#cmakedefine01 ENABLE_ACCELERATED_OVERFLOW_SCROLLING
    77#cmakedefine01 ENABLE_API_TESTS
     8#cmakedefine01 ENABLE_AVF_CAPTIONS
    89#cmakedefine01 ENABLE_ASSEMBLER_WX_EXCLUSIVE
    910#cmakedefine01 ENABLE_BATTERY_STATUS
     11#cmakedefine01 ENABLE_CACHE_PARTITIONING
    1012#cmakedefine01 ENABLE_CANVAS_PATH
    1113#cmakedefine01 ENABLE_CANVAS_PROXY
    1214#cmakedefine01 ENABLE_CHANNEL_MESSAGING
     15#cmakedefine01 ENABLE_CONTENT_FILTERING
    1316#cmakedefine01 ENABLE_CONTEXT_MENUS
    1417#cmakedefine01 ENABLE_CREDENTIAL_STORAGE
    … …  
    2831#cmakedefine01 ENABLE_CSS_SHAPES
    2932#cmakedefine01 ENABLE_CSS3_CONDITIONAL_RULES
     33#cmakedefine01 ENABLE_CURSOR_VISIBILITY
    3034#cmakedefine01 ENABLE_CUSTOM_SCHEME_HANDLER
     35#cmakedefine01 ENABLE_DASHBOARD_SUPPORT
     36#cmakedefine01 ENABLE_DATACUE_VALUE
    3137#cmakedefine01 ENABLE_DATALIST_ELEMENT
    3238#cmakedefine01 ENABLE_DATA_TRANSFER_ITEMS
    … …  
    5359#cmakedefine01 ENABLE_INDEXED_DATABASE
    5460#cmakedefine01 ENABLE_INDEXED_DATABASE_IN_WORKERS
     61#cmakedefine01 ENABLE_INDIE_UI
    5562#cmakedefine01 ENABLE_INPUT_TYPE_COLOR
     63#cmakedefine01 ENABLE_INPUT_TYPE_COLOR_POPOVER
    5664#cmakedefine01 ENABLE_INPUT_TYPE_DATE
    5765#cmakedefine01 ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE
    … …  
    6169#cmakedefine01 ENABLE_INPUT_TYPE_WEEK
    6270#cmakedefine01 ENABLE_INSPECTOR
     71#cmakedefine01 ENABLE_IOS_AIRPLAY
     72#cmakedefine01 ENABLE_IOS_TEXT_AUTOSIZING
    6373#cmakedefine01 ENABLE_JIT
     74#cmakedefine01 ENABLE_LEGACY_CSS_VENDOR_PREFIXES
    6475#cmakedefine01 ENABLE_LEGACY_NOTIFICATIONS
    6576#cmakedefine01 ENABLE_LEGACY_VENDOR_PREFIXES
    … …  
    8495#cmakedefine01 ENABLE_NOTIFICATIONS
    8596#cmakedefine01 ENABLE_ORIENTATION_EVENTS
     97#cmakedefine01 ENABLE_PDFKIT_PLUGIN
    8698#cmakedefine01 ENABLE_PERFORMANCE_TIMELINE
    8799#cmakedefine01 ENABLE_PICTURE_SIZES
     100#cmakedefine01 ENABLE_POINTER_LOCK
    88101#cmakedefine01 ENABLE_PROMISES
    89102#cmakedefine01 ENABLE_PROXIMITY_EVENTS
     103#cmakedefine01 ENABLE_PUBLIC_SUFFIX_LIST
    90104#cmakedefine01 ENABLE_QUOTA
     105#cmakedefine01 ENABLE_REMOTE_INSPECTOR
    91106#cmakedefine01 ENABLE_REQUEST_ANIMATION_FRAME
    92107#cmakedefine01 ENABLE_RESOLUTION_MEDIA_QUERY
    93108#cmakedefine01 ENABLE_RESOURCE_TIMING
    94109#cmakedefine01 ENABLE_SECCOMP_FILTERS
     110#cmakedefine01 ENABLE_SERVICE_CONTROLS
    95111#cmakedefine01 ENABLE_SHARED_WORKERS
    96112#cmakedefine01 ENABLE_SMOOTH_SCROLLING
    97113#cmakedefine01 ENABLE_SPELLCHECK
    98114#cmakedefine01 ENABLE_SQL_DATABASE
     115#cmakedefine01 ENABLE_SUBPIXEL_LAYOUT
     116#cmakedefine01 ENABLE_SUBTLE_CRYPTO
    99117#cmakedefine01 ENABLE_SVG_FONTS
     118#cmakedefine01 ENABLE_TELEPHONE_NUMBER_DETECTION
    100119#cmakedefine01 ENABLE_TEMPLATE_ELEMENT
    101120#cmakedefine01 ENABLE_TEXT_AUTOSIZING
    … …  
    112131#cmakedefine01 ENABLE_WEBGL
    113132#cmakedefine01 ENABLE_WEB_AUDIO
     133#cmakedefine01 ENABLE_WEBVTT_REGIONS
    114134#cmakedefine01 ENABLE_WEB_REPLAY
    115135#cmakedefine01 ENABLE_WEB_SOCKETS
Note: See TracChangeset for help on using the changeset viewer.