Title: [101685] trunk
- Revision
- 101685
- Author
- [email protected]
- Date
- 2011-12-01 10:30:43 -0800 (Thu, 01 Dec 2011)
Log Message
[CMake] Make the feature defines for DOM names explicit
https://bugs.webkit.org/show_bug.cgi?id=72812
Reviewed by Daniel Bates.
.:
Preprocessor defines used in WebCore/dom/make_names.pl are set via WEBKIT_FEATURE
for every port in the correspondig platform file. Pass an explicit list of defines
to the CMake macro, so we need to maintain the list only once.
* Source/cmake/OptionsBlackBerry.cmake:
* Source/cmake/OptionsEfl.cmake:
* Source/cmake/OptionsWinCE.cmake:
* Source/cmake/WebKitFeatures.cmake:
Source/WebCore:
* CMakeLists.txt:
Modified Paths
Diff
Modified: trunk/ChangeLog (101684 => 101685)
--- trunk/ChangeLog 2011-12-01 18:24:53 UTC (rev 101684)
+++ trunk/ChangeLog 2011-12-01 18:30:43 UTC (rev 101685)
@@ -1,3 +1,19 @@
+2011-12-01 Patrick Gansterer <[email protected]>
+
+ [CMake] Make the feature defines for DOM names explicit
+ https://bugs.webkit.org/show_bug.cgi?id=72812
+
+ Reviewed by Daniel Bates.
+
+ Preprocessor defines used in WebCore/dom/make_names.pl are set via WEBKIT_FEATURE
+ for every port in the correspondig platform file. Pass an explicit list of defines
+ to the CMake macro, so we need to maintain the list only once.
+
+ * Source/cmake/OptionsBlackBerry.cmake:
+ * Source/cmake/OptionsEfl.cmake:
+ * Source/cmake/OptionsWinCE.cmake:
+ * Source/cmake/WebKitFeatures.cmake:
+
2011-11-30 Alejandro G. Castro <[email protected]>
[GTK] Add accelerated compositing compilation option
Modified: trunk/Source/WebCore/CMakeLists.txt (101684 => 101685)
--- trunk/Source/WebCore/CMakeLists.txt 2011-12-01 18:24:53 UTC (rev 101684)
+++ trunk/Source/WebCore/CMakeLists.txt 2011-12-01 18:30:43 UTC (rev 101685)
@@ -2361,7 +2361,7 @@
ADD_SOURCE_WEBCORE_DERIVED_DEPENDENCIES(${WEBCORE_DIR}/html/HTMLTreeBuilder.cpp MathMLNames.cpp)
-GENERATE_DOM_NAMES(HTML ${WEBCORE_DIR}/html/HTMLAttributeNames.in ${WEBCORE_DIR}/html/HTMLTagNames.in "${HTML_FEATURES}")
+GENERATE_DOM_NAMES(HTML ${WEBCORE_DIR}/html/HTMLAttributeNames.in ${WEBCORE_DIR}/html/HTMLTagNames.in "")
LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/HTMLNames.cpp ${DERIVED_SOURCES_WEBCORE_DIR}/HTMLElementFactory.cpp ${DERIVED_SOURCES_WEBCORE_DIR}/JSHTMLElementWrapperFactory.cpp)
@@ -2381,14 +2381,14 @@
LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/WebKitFontFamilyNames.cpp)
-GENERATE_DOM_NAMES(MathML ${WEBCORE_DIR}/mathml/mathattrs.in ${WEBCORE_DIR}/mathml/mathtags.in "${MATHML_FEATURES}")
+GENERATE_DOM_NAMES(MathML ${WEBCORE_DIR}/mathml/mathattrs.in ${WEBCORE_DIR}/mathml/mathtags.in "")
LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/MathMLNames.cpp)
IF (ENABLE_MATHML)
LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/MathMLElementFactory.cpp)
ENDIF ()
-GENERATE_DOM_NAMES(SVG ${WEBCORE_DIR}/svg/svgattrs.in ${WEBCORE_DIR}/svg/svgtags.in "${SVG_FEATURES}")
+GENERATE_DOM_NAMES(SVG ${WEBCORE_DIR}/svg/svgattrs.in ${WEBCORE_DIR}/svg/svgtags.in "ENABLE_FILTERS=${ENABLE_FILTERS} ENABLE_SVG_FONTS=${ENABLE_SVG_FONTS}")
LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/SVGNames.cpp)
IF (ENABLE_SVG)
LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/SVGElementFactory.cpp ${DERIVED_SOURCES_WEBCORE_DIR}/JSSVGElementWrapperFactory.cpp)
Modified: trunk/Source/WebCore/ChangeLog (101684 => 101685)
--- trunk/Source/WebCore/ChangeLog 2011-12-01 18:24:53 UTC (rev 101684)
+++ trunk/Source/WebCore/ChangeLog 2011-12-01 18:30:43 UTC (rev 101685)
@@ -1,3 +1,12 @@
+2011-12-01 Patrick Gansterer <[email protected]>
+
+ [CMake] Make the feature defines for DOM names explicit
+ https://bugs.webkit.org/show_bug.cgi?id=72812
+
+ Reviewed by Daniel Bates.
+
+ * CMakeLists.txt:
+
2011-11-30 Dmitry Lomov <[email protected]>
https://bugs.webkit.org/show_bug.cgi?id=73503
Modified: trunk/Source/cmake/OptionsBlackBerry.cmake (101684 => 101685)
--- trunk/Source/cmake/OptionsBlackBerry.cmake 2011-12-01 18:24:53 UTC (rev 101684)
+++ trunk/Source/cmake/OptionsBlackBerry.cmake 2011-12-01 18:30:43 UTC (rev 101685)
@@ -145,7 +145,7 @@
WEBKIT_FEATURE(ENABLE_EVENT_MODE_METATAGS "Enable meta-tag touch and mouse events" DEFAULT ON)
WEBKIT_FEATURE(ENABLE_FAST_MOBILE_SCROLLING "Enable fast mobile scrolling" DEFAULT ON)
WEBKIT_FEATURE(ENABLE_FILE_SYSTEM "Enable file system" DEFAULT OFF)
-WEBKIT_FEATURE(ENABLE_FILTERS "Enable SVG filters" DEFAULT ON SVG)
+WEBKIT_FEATURE(ENABLE_FILTERS "Enable SVG filters" DEFAULT ON)
WEBKIT_FEATURE(ENABLE_FIXED_REPORTED_SIZE "Fixed Reported Size" DEFAULT ON)
WEBKIT_FEATURE(ENABLE_FTPDIR "Enable FTP directory browsing" DEFAULT ON)
WEBKIT_FEATURE(ENABLE_GEOLOCATION "Enable geolocation" DEFAULT ON)
@@ -166,17 +166,17 @@
WEBKIT_FEATURE(ENABLE_ORIENTATION_EVENTS "Enable orientation events" DEFAULT ON)
WEBKIT_FEATURE(ENABLE_PROGRESS_TAG "Enable progress tag" DEFAULT ON)
WEBKIT_FEATURE(ENABLE_REPAINT_THROTTLING "Enable repaint throttling" DEFAULT ON)
-WEBKIT_FEATURE(ENABLE_RUBY "Enable Ruby" DEFAULT ON HTML)
-WEBKIT_FEATURE(ENABLE_SANDBOX "Enable Sandbox" DEFAULT OFF HTML)
+WEBKIT_FEATURE(ENABLE_RUBY "Enable Ruby" DEFAULT ON)
+WEBKIT_FEATURE(ENABLE_SANDBOX "Enable Sandbox" DEFAULT OFF)
WEBKIT_FEATURE(ENABLE_SHARED_WORKERS "Enable shared workers" DEFAULT ON)
WEBKIT_FEATURE(ENABLE_SVG "Enable SVG" DEFAULT ON)
-WEBKIT_FEATURE(ENABLE_SVG_ANIMATION "Enable SVG animation" DEFAULT ON SVG)
-WEBKIT_FEATURE(ENABLE_SVG_AS_IMAGE "Enable SVG as image" DEFAULT ON SVG)
-WEBKIT_FEATURE(ENABLE_SVG_FONTS "Enable SVG fonts" DEFAULT ON SVG)
-WEBKIT_FEATURE(ENABLE_SVG_FOREIGN_OBJECT "Enable SVG foreign object" DEFAULT ON SVG)
-WEBKIT_FEATURE(ENABLE_SVG_USE "Enable SVG use" DEFAULT ON SVG)
+WEBKIT_FEATURE(ENABLE_SVG_ANIMATION "Enable SVG animation" DEFAULT ON)
+WEBKIT_FEATURE(ENABLE_SVG_AS_IMAGE "Enable SVG as image" DEFAULT ON)
+WEBKIT_FEATURE(ENABLE_SVG_FONTS "Enable SVG fonts" DEFAULT ON)
+WEBKIT_FEATURE(ENABLE_SVG_FOREIGN_OBJECT "Enable SVG foreign object" DEFAULT ON)
+WEBKIT_FEATURE(ENABLE_SVG_USE "Enable SVG use" DEFAULT ON)
WEBKIT_FEATURE(ENABLE_TOUCH_EVENTS "Enable touch events " DEFAULT ON)
-WEBKIT_FEATURE(ENABLE_VIDEO "Enable video" DEFAULT ON HTML)
+WEBKIT_FEATURE(ENABLE_VIDEO "Enable video" DEFAULT ON)
WEBKIT_FEATURE(ENABLE_VIEWPORT_REFLOW "Enable viewport reflow" DEFAULT ON)
WEBKIT_FEATURE(ENABLE_WEB_SOCKETS "Enable web sockets" DEFAULT ON)
WEBKIT_FEATURE(ENABLE_WML "Enable WML" DEFAULT OFF)
Modified: trunk/Source/cmake/OptionsEfl.cmake (101684 => 101685)
--- trunk/Source/cmake/OptionsEfl.cmake 2011-12-01 18:24:53 UTC (rev 101684)
+++ trunk/Source/cmake/OptionsEfl.cmake 2011-12-01 18:30:43 UTC (rev 101685)
@@ -67,12 +67,12 @@
WEBKIT_FEATURE(ENABLE_CHANNEL_MESSAGING "Enable channel messaging" DEFAULT ON)
WEBKIT_FEATURE(ENABLE_CLIENT_BASED_GEOLOCATION "Enable client based geolocation" DEFAULT OFF)
WEBKIT_FEATURE(ENABLE_DATAGRID "Enable datagrid" DEFAULT OFF)
-WEBKIT_FEATURE(ENABLE_DATALIST "Enable datalist" DEFAULT ON HTML)
+WEBKIT_FEATURE(ENABLE_DATALIST "Enable datalist" DEFAULT ON)
WEBKIT_FEATURE(ENABLE_DATA_TRANSFER_ITEMS "Enable data transfer items" DEFAULT OFF)
WEBKIT_FEATURE(ENABLE_DEVICE_ORIENTATION "Enable device orientation" DEFAULT OFF)
WEBKIT_FEATURE(ENABLE_FAST_MALLOC "Enable TCmalloc instead of system's allocator" DEFAULT ON)
WEBKIT_FEATURE(ENABLE_FAST_MOBILE_SCROLLING "Enable fast mobile scrolling" DEFAULT ON)
-WEBKIT_FEATURE(ENABLE_FILTERS "Enable SVG filters" DEFAULT ON SVG)
+WEBKIT_FEATURE(ENABLE_FILTERS "Enable SVG filters" DEFAULT ON)
WEBKIT_FEATURE(ENABLE_FTPDIR "Enable FTP directory support" DEFAULT ON)
WEBKIT_FEATURE(ENABLE_FULLSCREEN_API "Enable Fullscreen API support" DEFAULT OFF)
WEBKIT_FEATURE(ENABLE_GEOLOCATION "Enable geolocation" DEFAULT OFF)
@@ -93,10 +93,10 @@
WEBKIT_FEATURE(ENABLE_SHARED_WORKERS "Enable shared workers" DEFAULT ON)
WEBKIT_FEATURE(ENABLE_SQL_DATABASE "Enable SQL database" DEFAULT ON)
WEBKIT_FEATURE(ENABLE_SVG "Enable SVG" DEFAULT ON)
-WEBKIT_FEATURE(ENABLE_SVG_FONTS "Enable SVG fonts" DEFAULT ON SVG)
+WEBKIT_FEATURE(ENABLE_SVG_FONTS "Enable SVG fonts" DEFAULT ON)
WEBKIT_FEATURE(ENABLE_TOUCH_EVENTS "Enable Touch Events" DEFAULT OFF)
WEBKIT_FEATURE(ENABLE_TOUCH_ICON_LOADING "Enable Touch Icon Loading" DEFAULT OFF)
-WEBKIT_FEATURE(ENABLE_VIDEO "Enable video" DEFAULT ON HTML)
+WEBKIT_FEATURE(ENABLE_VIDEO "Enable video" DEFAULT ON)
WEBKIT_FEATURE(ENABLE_WEB_SOCKETS "Enable web sockets" DEFAULT ON)
WEBKIT_FEATURE(ENABLE_WORKERS "Enable workers" DEFAULT ON)
WEBKIT_FEATURE(ENABLE_XSLT "Enable XSLT" DEFAULT ON)
Modified: trunk/Source/cmake/OptionsWinCE.cmake (101684 => 101685)
--- trunk/Source/cmake/OptionsWinCE.cmake 2011-12-01 18:24:53 UTC (rev 101684)
+++ trunk/Source/cmake/OptionsWinCE.cmake 2011-12-01 18:30:43 UTC (rev 101685)
@@ -23,10 +23,10 @@
WEBKIT_FEATURE(ENABLE_CHANNEL_MESSAGING "Enable channel messaging" DEFAULT OFF)
WEBKIT_FEATURE(ENABLE_CLIENT_BASED_GEOLOCATION "Enable client based geolocation" DEFAULT OFF)
WEBKIT_FEATURE(ENABLE_DATAGRID "Enable datagrid" DEFAULT OFF)
-WEBKIT_FEATURE(ENABLE_DATALIST "Enable datalist" DEFAULT OFF HTML)
+WEBKIT_FEATURE(ENABLE_DATALIST "Enable datalist" DEFAULT OFF)
WEBKIT_FEATURE(ENABLE_DATA_TRANSFER_ITEMS "Enable data transfer items" DEFAULT OFF)
WEBKIT_FEATURE(ENABLE_FAST_MOBILE_SCROLLING "Enable fast mobile scrolling" DEFAULT ON)
-WEBKIT_FEATURE(ENABLE_FILTERS "Enable SVG filters" DEFAULT OFF SVG)
+WEBKIT_FEATURE(ENABLE_FILTERS "Enable SVG filters" DEFAULT OFF)
WEBKIT_FEATURE(ENABLE_FTPDIR "Enable FTP directory support" DEFAULT OFF)
WEBKIT_FEATURE(ENABLE_GEOLOCATION "Enable geolocation" DEFAULT OFF)
WEBKIT_FEATURE(ENABLE_GLIB_SUPPORT "Enable Glib support" DEFAULT OFF)
@@ -43,9 +43,9 @@
WEBKIT_FEATURE(ENABLE_SHARED_WORKERS "Enable shared workers" DEFAULT OFF)
WEBKIT_FEATURE(ENABLE_SQL_DATABASE "Enable SQL database" DEFAULT OFF)
WEBKIT_FEATURE(ENABLE_SVG "Enable SVG" DEFAULT ON)
-WEBKIT_FEATURE(ENABLE_SVG_FONTS "Enable SVG fonts" DEFAULT ON SVG)
+WEBKIT_FEATURE(ENABLE_SVG_FONTS "Enable SVG fonts" DEFAULT ON)
WEBKIT_FEATURE(ENABLE_TOUCH_EVENTS "Enable Touch Events" DEFAULT OFF)
-WEBKIT_FEATURE(ENABLE_VIDEO "Enable video" DEFAULT OFF HTML)
+WEBKIT_FEATURE(ENABLE_VIDEO "Enable video" DEFAULT OFF)
WEBKIT_FEATURE(ENABLE_WEB_SOCKETS "Enable web sockets" DEFAULT OFF)
WEBKIT_FEATURE(ENABLE_WORKERS "Enable workers" DEFAULT OFF)
WEBKIT_FEATURE(ENABLE_XSLT "Enable XSLT" DEFAULT OFF)
Modified: trunk/Source/cmake/WebKitFeatures.cmake (101684 => 101685)
--- trunk/Source/cmake/WebKitFeatures.cmake 2011-12-01 18:24:53 UTC (rev 101684)
+++ trunk/Source/cmake/WebKitFeatures.cmake 2011-12-01 18:30:43 UTC (rev 101685)
@@ -4,15 +4,7 @@
SET(WEBKIT_FEATURES "")
-SET(HTML_FEATURES "")
-SET(SVG_FEATURES "")
-MACRO(WEBKIT_SEPARATE_FEATURES _name _value)
- FOREACH(f ${ARGN})
- LIST(APPEND ${f}_FEATURES "${_name}=${_value}")
- ENDFOREACH()
-ENDMACRO(WEBKIT_SEPARATE_FEATURES)
-
MACRO(WEBKIT_FEATURE_CHECK_DEPS _deps _deps_ok)
SET(${_deps_ok} TRUE)
@@ -44,12 +36,7 @@
LIST(APPEND WEBKIT_FEATURES ${_feature})
IF (${_feature})
- SET(${_feature} 1)
- WEBKIT_SEPARATE_FEATURES(${_feature} 1 ${ARGN})
LIST(APPEND FEATURE_DEFINES ${_feature})
- ELSE ()
- SET(${_feature} 0)
- WEBKIT_SEPARATE_FEATURES(${_feature} 0 ${ARGN})
ENDIF ()
ENDMACRO()
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
