Progress towards using CMake on Mac.
authorachristensen@apple.com <achristensen@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 8 Aug 2014 18:13:54 +0000 (18:13 +0000)
committerachristensen@apple.com <achristensen@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 8 Aug 2014 18:13:54 +0000 (18:13 +0000)
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.

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

16 files changed:
CMakeLists.txt
ChangeLog
Source/WebCore/CMakeLists.txt
Source/WebCore/ChangeLog
Source/WebCore/PlatformEfl.cmake
Source/WebCore/PlatformGTK.cmake
Source/WebCore/PlatformMac.cmake
Source/WebCore/config.h
Source/WebCore/platform/graphics/ANGLEWebKitBridge.h
Source/WebCore/platform/graphics/FormatConverter.h
Source/WebCore/platform/mac/NSScrollerImpDetails.h
Source/cmake/OptionsEfl.cmake
Source/cmake/OptionsGTK.cmake
Source/cmake/OptionsMac.cmake
Source/cmake/WebKitFeatures.cmake
Source/cmakeconfig.h.cmake

index 02cfaf9..b8d45f7 100644 (file)
@@ -55,7 +55,9 @@ string(TOLOWER ${PORT} WEBKIT_PORT_DIR)
 # Find common packages (used by all ports)
 # -----------------------------------------------------------------------------
 find_package(BISON 2.3 REQUIRED)
-find_package(FLEX 2.5.34 REQUIRED)
+if (!APPLE)
+    find_package(FLEX 2.5.34 REQUIRED)
+endif ()
 
 # TODO Enforce version requirement for gperf
 find_package(Gperf 3.0.1 REQUIRED)
index 7b492cb..244d190 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
+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
+
 2014-08-08  Simon Fraser  <simon.fraser@apple.com>
 
         Undo some erroneous changes to the Xcode scheme files from r172259.
index 2dc0650..7dd3bde 100644 (file)
@@ -1,5 +1,6 @@
 set(WebCore_INCLUDE_DIRECTORIES
     "${WEBCORE_DIR}"
+    "${WEBCORE_DIR}/Modules/airplay"
     "${WEBCORE_DIR}/Modules/battery"
     "${WEBCORE_DIR}/Modules/encryptedmedia"
     "${WEBCORE_DIR}/Modules/gamepad"
@@ -30,6 +31,7 @@ set(WebCore_INCLUDE_DIRECTORIES
     "${WEBCORE_DIR}/bridge/jsc"
     "${WEBCORE_DIR}/crypto"
     "${WEBCORE_DIR}/crypto/keys"
+    "${WEBCORE_DIR}/crypto/parameters"
     "${WEBCORE_DIR}/css"
     "${WEBCORE_DIR}/cssjit"
     "${WEBCORE_DIR}/dom"
@@ -127,6 +129,7 @@ set(WebCore_INCLUDE_DIRECTORIES
 )
 
 set(WebCore_IDL_INCLUDES
+    Modules/airplay
     Modules/battery
     Modules/encryptedmedia
     Modules/gamepad
@@ -163,6 +166,8 @@ set(WebCore_IDL_INCLUDES
 )
 
 set(WebCore_IDL_FILES
+    Modules/airplay/WebKitPlaybackTargetAvailabilityEvent.idl
+
     Modules/battery/BatteryManager.idl
     Modules/battery/NavigatorBattery.idl
 
@@ -198,6 +203,8 @@ set(WebCore_IDL_FILES
     Modules/indexeddb/IDBVersionChangeEvent.idl
     Modules/indexeddb/WorkerGlobalScopeIndexedDatabase.idl
 
+    Modules/indieui/UIRequestEvent.idl
+
     Modules/mediacontrols/MediaControlsHost.idl
 
     Modules/mediasource/DOMURLMediaSource.idl
@@ -783,6 +790,8 @@ set(WebCore_INSPECTOR_DOMAINS
 )
 
 set(WebCore_SOURCES
+    Modules/airplay/WebKitPlaybackTargetAvailabilityEvent.cpp
+
     Modules/battery/BatteryController.cpp
     Modules/battery/BatteryManager.cpp
     Modules/battery/BatteryStatus.cpp
@@ -2084,7 +2093,6 @@ set(WebCore_SOURCES
     platform/graphics/Image.cpp
     platform/graphics/ImageBuffer.cpp
     platform/graphics/ImageOrientation.cpp
-    platform/graphics/ImageSource.cpp
     platform/graphics/IntPoint.cpp
     platform/graphics/IntRect.cpp
     platform/graphics/IntSize.cpp
@@ -2159,22 +2167,6 @@ set(WebCore_SOURCES
     platform/graphics/transforms/TransformationMatrix.cpp
     platform/graphics/transforms/TranslateTransformOperation.cpp
 
-    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
-
     platform/leveldb/LevelDBDatabase.cpp
     platform/leveldb/LevelDBTransaction.cpp
     platform/leveldb/LevelDBWriteBatch.cpp
index ec8eaaf..0dea9a4 100644 (file)
@@ -1,3 +1,25 @@
+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.
+
 2014-08-08  Zan Dobersek  <zdobersek@igalia.com>
 
         [CMake] Drop the required version of CMake down to 2.8.8
index 41ffc15..39773c3 100644 (file)
@@ -101,6 +101,7 @@ list(APPEND WebCore_SOURCES
     platform/geoclue/GeolocationProviderGeoclue1.cpp
     platform/geoclue/GeolocationProviderGeoclue2.cpp
 
+    platform/graphics/ImageSource.cpp
     platform/graphics/WOFFFileFormat.cpp
 
     platform/graphics/cairo/BitmapImageCairo.cpp
@@ -165,8 +166,24 @@ list(APPEND WebCore_SOURCES
     platform/graphics/texmap/coordinated/CoordinatedTile.cpp
     platform/graphics/texmap/coordinated/UpdateAtlas.cpp
 
+    platform/image-decoders/ImageDecoder.cpp
+
+    platform/image-decoders/bmp/BMPImageDecoder.cpp
+    platform/image-decoders/bmp/BMPImageReader.cpp
+
     platform/image-decoders/cairo/ImageDecoderCairo.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
+
     platform/linux/GamepadDeviceLinux.cpp
 
     platform/mediastream/gstreamer/MediaStreamCenterGStreamer.cpp
index e30b7c3..8019d80 100644 (file)
@@ -41,6 +41,7 @@ list(APPEND WebCore_SOURCES
     platform/geoclue/GeolocationProviderGeoclue2.cpp
 
     platform/graphics/GraphicsContext3DPrivate.cpp
+    platform/graphics/ImageSource.cpp
     platform/graphics/OpenGLShims.cpp
     platform/graphics/WOFFFileFormat.cpp
 
@@ -100,8 +101,24 @@ list(APPEND WebCore_SOURCES
 
     platform/gtk/GamepadsGtk.cpp
 
+    platform/image-decoders/ImageDecoder.cpp
+
     platform/image-decoders/cairo/ImageDecoderCairo.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/bmp/BMPImageDecoder.cpp
+    platform/image-decoders/bmp/BMPImageReader.cpp
+
+    platform/image-decoders/png/PNGImageDecoder.cpp
+
+    platform/image-decoders/webp/WEBPImageDecoder.cpp
+
     platform/linux/GamepadDeviceLinux.cpp
 
     platform/mediastream/gstreamer/MediaStreamCenterGStreamer.cpp
index 4804e49..7d07735 100644 (file)
@@ -1,7 +1,11 @@
 list(APPEND WebCore_INCLUDE_DIRECTORIES
     "${WEBCORE_DIR}/accessibility/mac"
+    "${WEBCORE_DIR}/bridge/objc"
+    "${WEBCORE_DIR}/loader/archive/cf"
+    "${WEBCORE_DIR}/loader/cf"
     "${WEBCORE_DIR}/page/cocoa"
     "${WEBCORE_DIR}/page/mac"
+    "${WEBCORE_DIR}/platform/cf"
     "${WEBCORE_DIR}/platform/cocoa"
     "${WEBCORE_DIR}/platform/graphics/avfoundation"
     "${WEBCORE_DIR}/platform/graphics/avfoundation/cf"
@@ -15,6 +19,8 @@ list(APPEND WebCore_INCLUDE_DIRECTORIES
     "${WEBCORE_DIR}/platform/network/cocoa"
     "${WEBCORE_DIR}/platform/network/cf"
     "${WEBCORE_DIR}/platform/network/mac"
+    "${WEBCORE_DIR}/platform/text/cf"
+    "${WEBCORE_DIR}/platform/text/mac"
     "${WEBCORE_DIR}/platform/mac"
     "${WEBCORE_DIR}/plugins/mac"
 
@@ -28,6 +34,12 @@ list(APPEND WebCore_SOURCES
     accessibility/mac/WebAccessibilityObjectWrapperBase.mm
     accessibility/mac/WebAccessibilityObjectWrapperMac.mm
 
+    loader/archive/cf/LegacyWebArchive.cpp
+    loader/archive/cf/LegacyWebArchiveMac.mm
+
+    loader/cf/ResourceLoaderCFNet.cpp
+    loader/cf/SubresourceLoaderCF.cpp
+
     page/cocoa/UserAgent.mm
 
     page/mac/ChromeMac.mm
@@ -48,11 +60,6 @@ list(APPEND WebCore_SOURCES
     platform/graphics/avfoundation/InbandTextTrackPrivateAVF.cpp
     platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp
 
-    platform/graphics/avfoundation/cf/CDMSessionAVFoundationCF.cpp
-    platform/graphics/avfoundation/cf/InbandTextTrackPrivateAVCF.cpp
-    platform/graphics/avfoundation/cf/InbandTextTrackPrivateLegacyAVCF.cpp
-    platform/graphics/avfoundation/cf/WebCoreAVCFResourceLoader.cpp
-
     platform/graphics/avfoundation/objc/AudioTrackPrivateAVFObjC.mm
     platform/graphics/avfoundation/objc/AudioTrackPrivateMediaSourceAVFObjC.cpp
     platform/graphics/avfoundation/objc/CDMSessionAVFoundationObjC.mm
@@ -83,16 +90,6 @@ list(APPEND WebCore_SOURCES
     platform/graphics/ca/mac/WebTiledBackingLayer.mm
 
     platform/graphics/opentype/OpenTypeMathData.cpp
-    platform/graphics/opentype/OpenTypeUtilities.cpp
-    platform/graphics/opentype/OpenTypeVerticalData.cpp
-
-    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
 
     platform/mac/BlockExceptions.mm
     platform/mac/ContentFilterMac.mm
@@ -196,6 +193,13 @@ list(APPEND WebCore_SOURCES
     platform/network/mac/WebCoreResourceHandleAsOperationQueueDelegate.mm
     platform/network/mac/WebCoreURLResponse.mm
 
+    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
+
     plugins/mac/PluginPackageMac.cpp
     plugins/mac/PluginViewMac.mm
 )
index 5dbd0f2..80e9c17 100644 (file)
 
 #endif /* OS(WINDOWS) */
 
+// Using CMake with Unix makefiles does not use prefix headers.
+#if PLATFORM(MAC) && defined(BUILDING_WITH_CMAKE)
+#include "WebCorePrefix.h"
+#endif
+
 #ifdef __cplusplus
 
 // These undefs match up with defines in WebCorePrefix.h for Mac OS X.
index 144eed0..f79f033 100644 (file)
@@ -29,7 +29,7 @@
 #include <wtf/text/CString.h>
 #include <wtf/text/WTFString.h>
 
-#if !PLATFORM(GTK) && !PLATFORM(EFL) && !PLATFORM(WIN)
+#if !PLATFORM(GTK) && !PLATFORM(EFL) && !PLATFORM(WIN) && !defined(BUILDING_WITH_CMAKE)
 #include "ANGLE/ShaderLang.h"
 #elif PLATFORM(WIN)
 #include "GLSLANG/ShaderLang.h"
index 3eb86c1..5d94d58 100644 (file)
@@ -25,8 +25,6 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-#include "config.h"
-
 #if USE(3D_GRAPHICS)
 
 #include "GraphicsContext3D.h"
index 5587dcf..ae521ab 100644 (file)
@@ -26,8 +26,6 @@
 #ifndef WebCore_NSScrollerImpDetails_h
 #define WebCore_NSScrollerImpDetails_h
 
-#include "config.h"
-
 // Public APIs not available on versions of Mac on which we build
 
 @interface NSObject (ScrollbarPainter)
index 385bf1d..4fd19f8 100644 (file)
@@ -95,6 +95,7 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SECCOMP_FILTERS OFF)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SHARED_WORKERS ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SPEECH_SYNTHESIS OFF)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SPELLCHECK ON)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SUBPIXEL_LAYOUT ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_TEMPLATE_ELEMENT ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_TOUCH_EVENTS ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_TOUCH_SLIDER ON)
index 50901ff..1b726d2 100644 (file)
@@ -137,6 +137,7 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_REQUEST_ANIMATION_FRAME ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SECCOMP_FILTERS OFF)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SHARED_WORKERS ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SPELLCHECK ON)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SUBPIXEL_LAYOUT ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_TEMPLATE_ELEMENT ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_TOUCH_EVENTS ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_USERSELECT_ALL ON)
index 1a63526..cbc3006 100644 (file)
@@ -24,6 +24,7 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_FILTERS ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_GRID_LAYOUT ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_IMAGE_ORIENTATION OFF)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_IMAGE_RESOLUTION OFF)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_IMAGE_SET ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_REGIONS ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_SHAPES ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS3_CONDITIONAL_RULES ON)
@@ -205,9 +206,10 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEBVTT_REGIONS ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_XHR_TIMEOUT ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_XSLT ON)
 
-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)
+# 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)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FTL_JIT_iphonesimulator OFF)
 
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LLINT_C_LOOP OFF)
index 81b3cf0..29f1434 100644 (file)
@@ -17,13 +17,17 @@ endmacro()
 macro(WEBKIT_OPTION_BEGIN)
     WEBKIT_OPTION_DEFINE(ENABLE_3D_RENDERING "Toggle 3D rendering support" OFF)
     WEBKIT_OPTION_DEFINE(ENABLE_ACCELERATED_2D_CANVAS "Toggle accelerated 2D canvas support" OFF)
+    WEBKIT_OPTION_DEFINE(ENABLE_ACCELERATED_OVERFLOW_SCROLLING "Toggle accelerated scrolling support" OFF)
     WEBKIT_OPTION_DEFINE(ENABLE_ACCESSIBILITY "Toggle accessibility support" OFF)
     WEBKIT_OPTION_DEFINE(ENABLE_API_TESTS "Enable public API unit tests" OFF)
+    WEBKIT_OPTION_DEFINE(ENABLE_AVF_CAPTIONS "Toggle AVFoundation caption support" OFF)
     WEBKIT_OPTION_DEFINE(ENABLE_ASSEMBLER_WX_EXCLUSIVE "Toggle Assembler WX Exclusive support" OFF)
     WEBKIT_OPTION_DEFINE(ENABLE_BATTERY_STATUS "Toggle battery status API support" OFF)
+    WEBKIT_OPTION_DEFINE(ENABLE_CACHE_PARTITIONING "Toggle cache partitioning support" OFF)
     WEBKIT_OPTION_DEFINE(ENABLE_CANVAS_PATH "Toggle Canvas Path support" ON)
     WEBKIT_OPTION_DEFINE(ENABLE_CANVAS_PROXY "Toggle CanvasProxy support" OFF)
     WEBKIT_OPTION_DEFINE(ENABLE_CHANNEL_MESSAGING "Toggle MessageChannel and MessagePort 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_CSP_NEXT "Toggle Content Security Policy 1.1 support" OFF)
     WEBKIT_OPTION_DEFINE(ENABLE_CSS3_CONDITIONAL_RULES "Toggle CSS3 Conditional Rules support" OFF)
@@ -40,7 +44,10 @@ macro(WEBKIT_OPTION_BEGIN)
     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_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_DASHBOARD_SUPPORT "Toggle dashboard support" OFF)
+    WEBKIT_OPTION_DEFINE(ENABLE_DATACUE_VALUE "Toggle datacue value support" OFF)
     WEBKIT_OPTION_DEFINE(ENABLE_DATALIST_ELEMENT "Toggle HTML5 datalist support" OFF)
     WEBKIT_OPTION_DEFINE(ENABLE_DATA_TRANSFER_ITEMS "Toggle HTML5 data transfer items support" OFF)
     WEBKIT_OPTION_DEFINE(ENABLE_DETAILS_ELEMENT "Toggle HTML5 details support" ON)
@@ -52,6 +59,7 @@ macro(WEBKIT_OPTION_BEGIN)
     WEBKIT_OPTION_DEFINE(ENABLE_ENCRYPTED_MEDIA_V2 "Support EME v2" OFF)
     WEBKIT_OPTION_DEFINE(ENABLE_FILTERS "Toggle SVG Filters support" 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_FULLSCREEN_API "Toggle Fullscreen API support" OFF)
     WEBKIT_OPTION_DEFINE(ENABLE_GAMEPAD "Toggle Gamepad support" OFF)
@@ -62,7 +70,9 @@ macro(WEBKIT_OPTION_BEGIN)
     WEBKIT_OPTION_DEFINE(ENABLE_ICONDATABASE "Toggle Icon database support" ON)
     WEBKIT_OPTION_DEFINE(ENABLE_IMAGE_DECODER_DOWN_SAMPLING "Toggle image decoder down sampling support" OFF)
     WEBKIT_OPTION_DEFINE(ENABLE_INDEXED_DATABASE "Toggle Indexed Database API support" OFF)
+    WEBKIT_OPTION_DEFINE(ENABLE_INDIE_UI "Toggle Indie UI support" OFF)
     WEBKIT_OPTION_DEFINE(ENABLE_INPUT_TYPE_COLOR "Toggle Color Input support" OFF)
+    WEBKIT_OPTION_DEFINE(ENABLE_INPUT_TYPE_COLOR_POPOVER "Toggle popover color input support" OFF)
     WEBKIT_OPTION_DEFINE(ENABLE_INPUT_TYPE_DATE "Toggle date type <input> support" OFF)
     WEBKIT_OPTION_DEFINE(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE "Toggle broken datetime type <input> support" OFF)
     WEBKIT_OPTION_DEFINE(ENABLE_INPUT_TYPE_DATETIMELOCAL "Toggle datetime-local type <input> support" OFF)
@@ -70,12 +80,17 @@ macro(WEBKIT_OPTION_BEGIN)
     WEBKIT_OPTION_DEFINE(ENABLE_INPUT_TYPE_TIME "Toggle time type <input> support" OFF)
     WEBKIT_OPTION_DEFINE(ENABLE_INPUT_TYPE_WEEK "Toggle week type <input> support" OFF)
     WEBKIT_OPTION_DEFINE(ENABLE_INSPECTOR "Toggle Web Inspector support" ON)
+    WEBKIT_OPTION_DEFINE(ENABLE_IOS_AIRPLAY "Toggle iOS airplay support" OFF)
+    WEBKIT_OPTION_DEFINE(ENABLE_IOS_TEXT_AUTOSIZING "Toggle iOS text autosizing support" OFF)
     WEBKIT_OPTION_DEFINE(ENABLE_JIT "Enable JustInTime javascript support" ON)
+    WEBKIT_OPTION_DEFINE(ENABLE_LEGACY_CSS_VENDOR_PREFIXES "Toggle legacy css vendor prefix support" OFF)
     WEBKIT_OPTION_DEFINE(ENABLE_LEGACY_NOTIFICATIONS "Toggle Legacy Desktop Notifications Support" OFF)
     WEBKIT_OPTION_DEFINE(ENABLE_LEGACY_VENDOR_PREFIXES "Toggle Legacy Vendor Prefix Support" ON)
     WEBKIT_OPTION_DEFINE(ENABLE_LEGACY_WEB_AUDIO "Toggle Legacy Web Audio support" ON)
+    WEBKIT_OPTION_DEFINE(ENABLE_LETTERPRESS "Toggle letterpress support" OFF)
     WEBKIT_OPTION_DEFINE(ENABLE_LINK_PREFETCH "Toggle pre fetching support" OFF)
     WEBKIT_OPTION_DEFINE(ENABLE_LLINT_C_LOOP "Force use of the llint c loop" OFF)
+    WEBKIT_OPTION_DEFINE(ENABLE_MAC_LONG_PRESS "Toggle mac long press support" OFF)
     WEBKIT_OPTION_DEFINE(ENABLE_MATHML "Toggle MathML support" ON)
     WEBKIT_OPTION_DEFINE(ENABLE_MEDIA_CAPTURE "Toggle Media Capture support" OFF)
     WEBKIT_OPTION_DEFINE(ENABLE_MEDIA_CONTROLS_SCRIPT "Toggle definition of media controls in Javascript" OFF)
@@ -93,20 +108,28 @@ macro(WEBKIT_OPTION_BEGIN)
     WEBKIT_OPTION_DEFINE(ENABLE_NETWORK_PROCESS "Toggle dedicated network process support in WebKit2" OFF)
     WEBKIT_OPTION_DEFINE(ENABLE_NOTIFICATIONS "Toggle Desktop Notifications Support" OFF)
     WEBKIT_OPTION_DEFINE(ENABLE_ORIENTATION_EVENTS "Toggle Orientation Events support" OFF)
+    WEBKIT_OPTION_DEFINE(ENABLE_PDFKIT_PLUGIN "Toggle PDFKit plugin support" OFF)
     WEBKIT_OPTION_DEFINE(ENABLE_PERFORMANCE_TIMELINE "Toggle Performance Timeline support" OFF)
     WEBKIT_OPTION_DEFINE(ENABLE_PICTURE_SIZES "Toggle sizes attribute support" OFF)
+    WEBKIT_OPTION_DEFINE(ENABLE_POINTER_LOCK "Toggle pointer lock support" OFF)
     WEBKIT_OPTION_DEFINE(ENABLE_PROMISES "Toggle Promise support" ON)
     WEBKIT_OPTION_DEFINE(ENABLE_PROXIMITY_EVENTS "Toggle Proximity Events support" OFF)
+    WEBKIT_OPTION_DEFINE(ENABLE_PUBLIC_SUFFIX_LIST "Toggle public suffix list support" OFF)
     WEBKIT_OPTION_DEFINE(ENABLE_QUOTA "Toggle Quota support" OFF)
+    WEBKIT_OPTION_DEFINE(ENABLE_REMOTE_INSPECTOR "Toggle remote inspector support" OFF)
     WEBKIT_OPTION_DEFINE(ENABLE_REQUEST_ANIMATION_FRAME "Toggle requestAnimationFrame support" OFF)
     WEBKIT_OPTION_DEFINE(ENABLE_RESOLUTION_MEDIA_QUERY "Toggle resolution media query support" OFF)
     WEBKIT_OPTION_DEFINE(ENABLE_RESOURCE_TIMING "Toggle Resource Timing support" OFF)
     WEBKIT_OPTION_DEFINE(ENABLE_SECCOMP_FILTERS "Toggle Linux seccomp filters for the WebProcess support" OFF)
+    WEBKIT_OPTION_DEFINE(ENABLE_SERVICE_CONTROLS "Toggle service controls support" OFF)
     WEBKIT_OPTION_DEFINE(ENABLE_SHARED_WORKERS "Toggle SharedWorkers support" OFF)
     WEBKIT_OPTION_DEFINE(ENABLE_SPEECH_SYNTHESIS "Toggle Speech Synthesis API support)" OFF)
     WEBKIT_OPTION_DEFINE(ENABLE_SPELLCHECK "Toggle Spellchecking support (requires Enchant)" OFF)
     WEBKIT_OPTION_DEFINE(ENABLE_SQL_DATABASE "Toggle SQL Database Support" ON)
+    WEBKIT_OPTION_DEFINE(ENABLE_SUBPIXEL_LAYOUT "Toggle subpixel layout support" OFF)
+    WEBKIT_OPTION_DEFINE(ENABLE_SUBTLE_CRYPTO "Toggle subtle crypto support" OFF)
     WEBKIT_OPTION_DEFINE(ENABLE_SVG_FONTS "Toggle SVG fonts support (imples SVG support)" ON)
+    WEBKIT_OPTION_DEFINE(ENABLE_TELEPHONE_NUMBER_DETECTION "Toggle telephone number detection support" OFF)
     WEBKIT_OPTION_DEFINE(ENABLE_TEMPLATE_ELEMENT "Toggle Template support" ON)
     WEBKIT_OPTION_DEFINE(ENABLE_TEXT_AUTOSIZING "Toggle Text auto sizing support" OFF)
     WEBKIT_OPTION_DEFINE(ENABLE_TOUCH_EVENTS "Toggle Touch Events support" OFF)
@@ -123,6 +146,7 @@ macro(WEBKIT_OPTION_BEGIN)
     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 TCmalloc" OFF)
index 5f8fd40..63c31da 100644 (file)
@@ -5,11 +5,14 @@
 #cmakedefine01 ENABLE_ACCELERATED_2D_CANVAS
 #cmakedefine01 ENABLE_ACCELERATED_OVERFLOW_SCROLLING
 #cmakedefine01 ENABLE_API_TESTS
+#cmakedefine01 ENABLE_AVF_CAPTIONS
 #cmakedefine01 ENABLE_ASSEMBLER_WX_EXCLUSIVE
 #cmakedefine01 ENABLE_BATTERY_STATUS
+#cmakedefine01 ENABLE_CACHE_PARTITIONING
 #cmakedefine01 ENABLE_CANVAS_PATH
 #cmakedefine01 ENABLE_CANVAS_PROXY
 #cmakedefine01 ENABLE_CHANNEL_MESSAGING
+#cmakedefine01 ENABLE_CONTENT_FILTERING
 #cmakedefine01 ENABLE_CONTEXT_MENUS
 #cmakedefine01 ENABLE_CREDENTIAL_STORAGE
 #cmakedefine01 ENABLE_CSP_NEXT
 #cmakedefine01 ENABLE_CSS_SELECTORS_LEVEL4
 #cmakedefine01 ENABLE_CSS_SHAPES
 #cmakedefine01 ENABLE_CSS3_CONDITIONAL_RULES
+#cmakedefine01 ENABLE_CURSOR_VISIBILITY
 #cmakedefine01 ENABLE_CUSTOM_SCHEME_HANDLER
+#cmakedefine01 ENABLE_DASHBOARD_SUPPORT
+#cmakedefine01 ENABLE_DATACUE_VALUE
 #cmakedefine01 ENABLE_DATALIST_ELEMENT
 #cmakedefine01 ENABLE_DATA_TRANSFER_ITEMS
 #cmakedefine01 ENABLE_DETAILS_ELEMENT
@@ -52,7 +58,9 @@
 #cmakedefine01 ENABLE_IMAGE_DECODER_DOWN_SAMPLING
 #cmakedefine01 ENABLE_INDEXED_DATABASE
 #cmakedefine01 ENABLE_INDEXED_DATABASE_IN_WORKERS
+#cmakedefine01 ENABLE_INDIE_UI
 #cmakedefine01 ENABLE_INPUT_TYPE_COLOR
+#cmakedefine01 ENABLE_INPUT_TYPE_COLOR_POPOVER
 #cmakedefine01 ENABLE_INPUT_TYPE_DATE
 #cmakedefine01 ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE
 #cmakedefine01 ENABLE_INPUT_TYPE_DATETIMELOCAL
 #cmakedefine01 ENABLE_INPUT_TYPE_MONTH
 #cmakedefine01 ENABLE_INPUT_TYPE_WEEK
 #cmakedefine01 ENABLE_INSPECTOR
+#cmakedefine01 ENABLE_IOS_AIRPLAY
+#cmakedefine01 ENABLE_IOS_TEXT_AUTOSIZING
 #cmakedefine01 ENABLE_JIT
+#cmakedefine01 ENABLE_LEGACY_CSS_VENDOR_PREFIXES
 #cmakedefine01 ENABLE_LEGACY_NOTIFICATIONS
 #cmakedefine01 ENABLE_LEGACY_VENDOR_PREFIXES
 #cmakedefine01 ENABLE_LEGACY_WEB_AUDIO
 #cmakedefine01 ENABLE_NETWORK_PROCESS
 #cmakedefine01 ENABLE_NOTIFICATIONS
 #cmakedefine01 ENABLE_ORIENTATION_EVENTS
+#cmakedefine01 ENABLE_PDFKIT_PLUGIN
 #cmakedefine01 ENABLE_PERFORMANCE_TIMELINE
 #cmakedefine01 ENABLE_PICTURE_SIZES
+#cmakedefine01 ENABLE_POINTER_LOCK
 #cmakedefine01 ENABLE_PROMISES
 #cmakedefine01 ENABLE_PROXIMITY_EVENTS
+#cmakedefine01 ENABLE_PUBLIC_SUFFIX_LIST
 #cmakedefine01 ENABLE_QUOTA
+#cmakedefine01 ENABLE_REMOTE_INSPECTOR
 #cmakedefine01 ENABLE_REQUEST_ANIMATION_FRAME
 #cmakedefine01 ENABLE_RESOLUTION_MEDIA_QUERY
 #cmakedefine01 ENABLE_RESOURCE_TIMING
 #cmakedefine01 ENABLE_SECCOMP_FILTERS
+#cmakedefine01 ENABLE_SERVICE_CONTROLS
 #cmakedefine01 ENABLE_SHARED_WORKERS
 #cmakedefine01 ENABLE_SMOOTH_SCROLLING
 #cmakedefine01 ENABLE_SPELLCHECK
 #cmakedefine01 ENABLE_SQL_DATABASE
+#cmakedefine01 ENABLE_SUBPIXEL_LAYOUT
+#cmakedefine01 ENABLE_SUBTLE_CRYPTO
 #cmakedefine01 ENABLE_SVG_FONTS
+#cmakedefine01 ENABLE_TELEPHONE_NUMBER_DETECTION
 #cmakedefine01 ENABLE_TEMPLATE_ELEMENT
 #cmakedefine01 ENABLE_TEXT_AUTOSIZING
 #cmakedefine01 ENABLE_TOUCH_EVENTS
 #cmakedefine01 ENABLE_VIEW_MODE_CSS_MEDIA
 #cmakedefine01 ENABLE_WEBGL
 #cmakedefine01 ENABLE_WEB_AUDIO
+#cmakedefine01 ENABLE_WEBVTT_REGIONS
 #cmakedefine01 ENABLE_WEB_REPLAY
 #cmakedefine01 ENABLE_WEB_SOCKETS
 #cmakedefine01 ENABLE_WEB_TIMING