[Gtk] Remove configuration options for stable features that are currently enabled
authorzandobersek@gmail.com <zandobersek@gmail.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 17 Sep 2012 17:58:07 +0000 (17:58 +0000)
committerzandobersek@gmail.com <zandobersek@gmail.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 17 Sep 2012 17:58:07 +0000 (17:58 +0000)
https://bugs.webkit.org/show_bug.cgi?id=96621

Reviewed by Martin Robinson.

.:

Remove configuration flags that were used for either features that were enabled
by default or were enabled only when unstable features support was enabled. In
any case the feature was removed only if it does not introduce a dependency.

* configure.ac:

Source/WebCore:

Remove Automake conditional checking for features that are being removed in
configure.ac. Unstable features that don't introduce dependencies are now
disabled if necessary by being listed in the unstable feature defines overriding
variable.

No new tests - no new functionality.

* GNUmakefile.am:
* GNUmakefile.features.am:
* bindings/gobject/GNUmakefile.am:

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

ChangeLog
Source/WebCore/ChangeLog
Source/WebCore/GNUmakefile.am
Source/WebCore/GNUmakefile.features.am
Source/WebCore/bindings/gobject/GNUmakefile.am
configure.ac

index 4279967..9e2d768 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2012-09-17  Zan Dobersek  <zandobersek@gmail.com>
+
+        [Gtk] Remove configuration options for stable features that are currently enabled
+        https://bugs.webkit.org/show_bug.cgi?id=96621
+
+        Reviewed by Martin Robinson.
+
+        Remove configuration flags that were used for either features that were enabled
+        by default or were enabled only when unstable features support was enabled. In
+        any case the feature was removed only if it does not introduce a dependency.
+
+        * configure.ac:
+
 2012-09-17  Tor Arne Vestbø  <tor.arne.vestbo@nokia.com>
 
         [Qt] Auto-generate the module pri file for QtWebKit
index 9c487d7..7bd61b2 100644 (file)
@@ -1,3 +1,21 @@
+2012-09-17  Zan Dobersek  <zandobersek@gmail.com>
+
+        [Gtk] Remove configuration options for stable features that are currently enabled
+        https://bugs.webkit.org/show_bug.cgi?id=96621
+
+        Reviewed by Martin Robinson.
+
+        Remove Automake conditional checking for features that are being removed in
+        configure.ac. Unstable features that don't introduce dependencies are now
+        disabled if necessary by being listed in the unstable feature defines overriding
+        variable.
+
+        No new tests - no new functionality.
+
+        * GNUmakefile.am:
+        * GNUmakefile.features.am:
+        * bindings/gobject/GNUmakefile.am:
+
 2012-09-17  Lauro Neto  <lauro.neto@openbossa.org>
 
         [Qt] Cleanup/refactor the user agent detection code
index 0eb543d..61f2d9e 100644 (file)
@@ -120,15 +120,6 @@ webcoregtk_cppflags += \
        -I$(srcdir)/Source/WebCore/platform/text/enchant
 
 # ---
-# Channel mesaging support
-# ---
-if ENABLE_CHANNEL_MESSAGING
-feature_defines_overrides += ENABLE_CHANNEL_MESSAGING=1
-else
-feature_defines_overrides += ENABLE_CHANNEL_MESSAGING=0
-endif # END ENABLE_CHANNEL_MESSAGING
-
-# ---
 # FreeType font backend
 # ---
 if USE_FREETYPE
@@ -155,33 +146,6 @@ webcoregtk_cppflags += \
 endif # END TARGET_WIN32
 
 # ----
-# HTML Meter Element
-# ----
-if ENABLE_METER_ELEMENT
-feature_defines_overrides += ENABLE_METER_ELEMENT=1
-else
-feature_defines_overrides += ENABLE_METER_ELEMENT=0
-endif # END ENABLE_METER_ELEMENT
-
-# ----
-# HTML Progress Element
-# ----
-if ENABLE_PROGRESS_ELEMENT
-feature_defines_overrides += ENABLE_PROGRESS_ELEMENT=1
-else
-feature_defines_overrides += ENABLE_PROGRESS_ELEMENT=0
-endif # END ENABLE_PROGRESS_ELEMENT
-
-# ----
-# JavaScript Debugger/Profiler
-# ----
-if ENABLE_JAVASCRIPT_DEBUGGER
-feature_defines_overrides += ENABLE_JAVASCRIPT_DEBUGGER=1
-else
-feature_defines_overrides += ENABLE_JAVASCRIPT_DEBUGGER=0
-endif # END ENABLE_JAVASCRIPT_DEBUGGER
-
-# ----
 # Gamepad support
 # ---
 if ENABLE_GAMEPAD
@@ -191,15 +155,6 @@ feature_defines_overrides += ENABLE_GAMEPAD=0
 endif # END ENABLE_GAMEPAD
 
 # ----
-# Database Support
-# ----
-if ENABLE_SQL_DATABASE
-feature_defines_overrides += ENABLE_SQL_DATABASE=1
-else
-feature_defines_overrides += ENABLE_SQL_DATABASE=0
-endif # END ENABLE_SQL_DATABASE
-
-# ----
 # Indexed Database API support
 # ----
 if ENABLE_INDEXED_DATABASE
@@ -213,24 +168,6 @@ webcore_cppflags += -DWTF_USE_LEVELDB
 endif # END USE_LEVELDB
 
 # ----
-# DOM mutation observer support
-# ----
-if ENABLE_MUTATION_OBSERVERS
-feature_defines_overrides += ENABLE_MUTATION_OBSERVERS=1
-else
-feature_defines_overrides += ENABLE_MUTATION_OBSERVERS=0
-endif # END ENABLE_MUTATION_OBSERVERS
-
-# ----
-# Icon Database Support
-# ----
-if ENABLE_ICONDATABASE
-feature_defines_overrides += -DENABLE_ICONDATABASE=1
-else
-feature_defines_overrides += -DENABLE_ICONDATABASE=0
-endif # END ENABLE_ICONDATABASE
-
-# ----
 # Video Support
 # ----
 if ENABLE_VIDEO
@@ -241,19 +178,10 @@ webcore_cppflags += -DGST_DISABLE_DEPRECATED
 endif # END ENABLE_DEBUG
 endif # END USE_GSTREAMER
 else
-feature_defines_overrides += ENABLE_VIDEO=0
+feature_defines_overrides += ENABLE_VIDEO=0 ENABLE_VIDEO_TRACK=0
 endif # END ENABLE_VIDEO
 
 # ----
-# Javascript Fullscreen Support
-# ----
-if ENABLE_FULLSCREEN_API
-feature_defines_overrides += ENABLE_FULLSCREEN_API=1
-else
-feature_defines_overrides += ENABLE_FULLSCREEN_API=0
-endif # END ENABLE_FULLSCREEN_API
-
-# ----
 # Filters
 # ----
 if ENABLE_CSS_FILTERS
@@ -263,15 +191,6 @@ feature_defines_overrides += ENABLE_CSS_FILTERS=0
 endif # END ENABLE_CSS_FILTERS
 
 # ----
-# Track Support
-# ----
-if ENABLE_VIDEO_TRACK
-feature_defines_overrides += ENABLE_VIDEO_TRACK=1
-else
-feature_defines_overrides += ENABLE_VIDEO_TRACK=0
-endif # END ENABLE_VIDEO_TRACK
-
-# ----
 # Media Stream Support
 # ----
 if ENABLE_MEDIA_STREAM
@@ -304,33 +223,6 @@ feature_defines_overrides += ENABLE_XSLT=0
 endif # END ENABLE_XSLT
 
 # ----
-# Web Workers support
-# ----
-if ENABLE_WORKERS
-feature_defines_overrides += ENABLE_WORKERS=1
-else
-feature_defines_overrides += ENABLE_WORKERS=0
-endif
-
-# ---
-# Shadow DOM support
-# ---
-if ENABLE_SHADOW_DOM
-feature_defines_overrides += ENABLE_SHADOW_DOM=1
-else
-feature_defines_overrides += ENABLE_SHADOW_DOM=0
-endif
-
-# ---
-# SharedWorker support
-# ---
-if ENABLE_SHARED_WORKERS
-feature_defines_overrides += ENABLE_SHARED_WORKERS=1
-else
-feature_defines_overrides += ENABLE_SHARED_WORKERS=0
-endif
-
-# ----
 # Filters
 # ----
 if ENABLE_FILTERS
@@ -340,32 +232,6 @@ feature_defines_overrides += ENABLE_FILTERS=0
 endif # END ENABLE_FILTERS
 
 # ----
-# CSS box decoration break
-# ----
-if ENABLE_CSS_BOX_DECORATION_BREAK
-feature_defines_overrides += ENABLE_CSS_BOX_DECORATION_BREAK=1
-else
-feature_defines_overrides += ENABLE_CSS_BOX_DECORATION_BREAK=0
-endif # END ENABLE_CSS_BOX_DECORATION_BREAK
-
-# ----
-# Regions
-# ----
-if ENABLE_CSS_REGIONS
-feature_defines_overrides += ENABLE_CSS_REGIONS=1
-else
-feature_defines_overrides += ENABLE_CSS_REGIONS=0
-endif # END ENABLE_CSS_REGIONS
-
-# ----
-# Exclusions
-# ----
-if ENABLE_CSS_EXCLUSIONS
-feature_defines_overrides += ENABLE_CSS_EXCLUSIONS=1
-else
-feature_defines_overrides += ENABLE_CSS_EXCLUSIONS=0
-endif # END ENABLE_CSS_EXCLUSIONS
-
 # Shaders
 # ----
 if ENABLE_CSS_SHADERS
@@ -383,15 +249,6 @@ else
 feature_defines_overrides += ENABLE_GEOLOCATION=0
 endif # END ENABLE_GEOLOCATION
 
-# ----
-# MathML support
-# ----
-if ENABLE_MATHML
-feature_defines_overrides += ENABLE_MATHML=1
-else
-feature_defines_overrides += ENABLE_MATHML=0
-endif # END ENABLE_MATHML
-
 # MathML tag and attribute names, and element factory
 DerivedSources/WebCore/MathMLElementFactory.h: DerivedSources/WebCore/MathMLElementFactory.cpp
 DerivedSources/WebCore/MathMLNames.h: DerivedSources/WebCore/MathMLNames.cpp
@@ -442,51 +299,6 @@ if USE_WEBAUDIO_GSTREAMER
 webcore_cppflags += -DWTF_USE_WEBAUDIO_GSTREAMER=1
 endif
 
-# ----
-# Web Sockets Support
-# ----
-if ENABLE_WEB_SOCKETS
-feature_defines_overrides += ENABLE_WEB_SOCKETS=1
-else
-feature_defines_overrides += ENABLE_WEB_SOCKETS=0
-endif  # END ENABLE_WEB_SOCKETS
-
-# ---
-# Blob support
-# ---
-if ENABLE_BLOB
-feature_defines_overrides += ENABLE_BLOB=1
-else
-feature_defines_overrides += ENABLE_BLOB=0
-endif  # END ENABLE_BLOB
-
-# ---
-# Legacy vendor prefixes support
-# ---
-if ENABLE_LEGACY_VENDOR_PREFIXES
-feature_defines_overrides += ENABLE_LEGACY_VENDOR_PREFIXES=1
-else
-feature_defines_overrides += ENABLE_LEGACY_VENDOR_PREFIXES=0
-endif  # END ENABLE_LEGACY_VENDOR_PREFIXES
-
-# ---
-# Legacy WebKitBlobBuilder support
-# ---
-if ENABLE_LEGACY_WEBKIT_BLOB_BUILDER
-feature_defines_overrides += ENABLE_LEGACY_WEBKIT_BLOB_BUILDER=1
-else
-feature_defines_overrides += ENABLE_LEGACY_WEBKIT_BLOB_BUILDER=0
-endif  # END ENABLE_LEGACY_WEBKIT_BLOB_BUILDER
-
-# ---
-# RequestAnimationFrame support
-# ---
-if ENABLE_REQUEST_ANIMATION_FRAME
-feature_defines_overrides += ENABLE_REQUEST_ANIMATION_FRAME=1
-else
-feature_defines_overrides += ENABLE_REQUEST_ANIMATION_FRAME=0
-endif  # END ENABLE_REQUEST_ANIMATION_FRAME
-
 # ---
 # 3D canvas (WebGL) support
 # ---
@@ -522,42 +334,6 @@ webcore_cppflags += \
 endif  # END USE_CLUTTER
 
 # ---
-# MHTML support
-# ---
-if ENABLE_MHTML
-feature_defines_overrides += ENABLE_MHTML=1
-else
-feature_defines_overrides += ENABLE_MHTML=0
-endif  # END ENABLE_MHTML
-
-# ---
-# Web Timing support
-# ---
-if ENABLE_WEB_TIMING
-feature_defines_overrides += ENABLE_WEB_TIMING=1
-else
-feature_defines_overrides += ENABLE_WEB_TIMING=0
-endif  # END ENABLE_WEB_TIMING
-
-# ---
-# HTML iframe seamless attribute support
-# ---
-if ENABLE_IFRAME_SEAMLESS
-feature_defines_overrides += ENABLE_IFRAME_SEAMLESS=1
-else
-feature_defines_overrides += ENABLE_IFRAME_SEAMLESS=0
-endif  # END ENABLE_IFRAME_SEAMLESS
-
-# ---
-# Link prefetch support
-# ---
-if ENABLE_LINK_PREFETCH
-feature_defines_overrides += ENABLE_LINK_PREFETCH=1
-else
-feature_defines_overrides += ENABLE_LINK_PREFETCH=0
-endif  # END ENABLE_LINK_PREFETCH
-
-# ---
 # Spell check support
 # ---
 if ENABLE_SPELLCHECK
@@ -571,8 +347,11 @@ endif  # END ENABLE_SPELLCHECK
 # If unstable features should not be enabled, their defines should be overriden with a 0 value.
 # ---
 if !ENABLE_UNSTABLE_FEATURES
-# FIXME: List unstable features here once their configuration options are removed.
-feature_defines_unstable +=
+feature_defines_unstable += \
+       ENABLE_MUTATION_OBSERVERS=0 \
+       ENABLE_LINK_PREFETCH=0 \
+       ENABLE_VIDEO_TRACK=0 \
+       ENABLE_WEB_TIMING=0
 endif
 
 
index f0ab17d..07c9418 100644 (file)
@@ -57,7 +57,7 @@ feature_defines_defaults += \
        ENABLE_MEDIA_STATISTICS=0 \
        ENABLE_MEDIA_STREAM=1 \
        ENABLE_METER_ELEMENT=1 \
-       ENABLE_MHTML=0 \
+       ENABLE_MHTML=1 \
        ENABLE_MICRODATA=0 \
        ENABLE_MUTATION_OBSERVERS=1 \
        ENABLE_NAVIGATOR_CONTENT_UTILS=0 \
index 443bdf6..2328f95 100644 (file)
@@ -412,9 +412,9 @@ webkitgtk_gdom_built_sources += \
        DerivedSources/webkit/WebKitDOMHTMLAudioElementPrivate.h \
        DerivedSources/webkit/WebKitDOMHTMLVideoElement.cpp \
        DerivedSources/webkit/WebKitDOMHTMLVideoElementPrivate.h
-endif
 
-if ENABLE_VIDEO_TRACK
+# Video Track feature currently depends on HTML Video and is considered unstable.
+if ENABLE_UNSTABLE_FEATURES
 webkitgtk_built_h_api += \
        $(top_builddir)/DerivedSources/webkit/WebKitDOMTextTrack.h \
        $(top_builddir)/DerivedSources/webkit/WebKitDOMTextTrackList.h \
@@ -433,8 +433,10 @@ webkitgtk_gdom_built_sources += \
        DerivedSources/webkit/WebKitDOMTrackEvent.cpp \
        DerivedSources/webkit/WebKitDOMTrackEventPrivate.h
 endif
+endif
 
-if ENABLE_WEB_TIMING
+# Web Timing feature is currently considered unstable.
+if ENABLE_UNSTABLE_FEATURES
 webkitgtk_built_h_api += \
        $(top_builddir)/DerivedSources/webkit/WebKitDOMPerformance.h \
        $(top_builddir)/DerivedSources/webkit/WebKitDOMPerformanceNavigation.h \
index 0b2d1ca..f0196e9 100644 (file)
@@ -607,38 +607,6 @@ AC_ARG_ENABLE(accelerated_compositing,
             ])
 AC_MSG_RESULT([$enable_accelerated_compositing])
 
-# check whether to enable channel messaging support
-AC_MSG_CHECKING([whether to enable HTML5 Channel Messaging support])
-AC_ARG_ENABLE(channel_messaging,
-              AC_HELP_STRING([--enable-channel-messaging],
-                             [enable HTML5 channel messaging support [default=yes]]),
-              [],[enable_channel_messaging="yes"])
-AC_MSG_RESULT([$enable_channel_messaging])
-
-# check whether to enable the meter tag
-AC_MSG_CHECKING([whether to enable HTML5 meter tag])
-AC_ARG_ENABLE(meter_tag,
-              AC_HELP_STRING([--enable-meter-tag],
-                             [enable HTML5 meter [default=yes]]),
-              [],[enable_meter_tag="yes"])
-AC_MSG_RESULT([$enable_meter_tag])
-
-# check whether to enable the progress tag
-AC_MSG_CHECKING([whether to enable HTML5 progress tag])
-AC_ARG_ENABLE(progress_tag,
-              AC_HELP_STRING([--enable-progress-tag],
-                             [enable HTML5 progress [default=yes]]),
-              [],[enable_progress_tag="yes"])
-AC_MSG_RESULT([$enable_progress_tag])
-
-# check whether to enable JavaScript debugger/profiler support
-AC_MSG_CHECKING([whether to enable JavaScript debugger/profiler support])
-AC_ARG_ENABLE(javascript_debugger,
-              AC_HELP_STRING([--enable-javascript-debugger],
-                             [enable JavaScript debugger/profiler support [default=yes]]),
-              [],[enable_javascript_debugger="yes"])
-AC_MSG_RESULT([$enable_javascript_debugger])
-
 # check whether to enable Gamepad support
 AC_MSG_CHECKING([whether to enable Gamepad support])
 AC_ARG_ENABLE(gamepad,
@@ -652,14 +620,6 @@ if test "$enable_gamepad" = "yes" && test "$os_linux" = no; then
    enable_gamepad=no;
 fi
 
-# check whether to enable DOM mutation observer support
-AC_MSG_CHECKING([whether to enable DOM mutation observer support])
-AC_ARG_ENABLE(mutation_observers,
-              AC_HELP_STRING([--enable-mutation-observers],
-                             [enable DOM mutation observer support [default=no]]),
-              [],[enable_mutation_observers=$enable_unstable_features])
-AC_MSG_RESULT([$enable_mutation_observers])
-
 # check whether to enable the indexed database API
 AC_MSG_CHECKING([whether to enable the indexed database API])
 AC_ARG_ENABLE(indexed_database,
@@ -668,30 +628,6 @@ AC_ARG_ENABLE(indexed_database,
               [],[enable_indexed_database="no"])
 AC_MSG_RESULT([$enable_indexed_database])
 
-# check whether to build with SQL database support
-AC_MSG_CHECKING([whether to enable SQL client-side database storage support])
-AC_ARG_ENABLE(sql_database,
-              AC_HELP_STRING([--enable-sql-database],
-                             [enable SQL client-side database storage support [default=yes]]),
-              [],[enable_sql_database="yes"])
-AC_MSG_RESULT([$enable_sql_database])
-
-# check whether to build with icon database support
-AC_MSG_CHECKING([whether to enable icon database support])
-AC_ARG_ENABLE(icon_database,
-              AC_HELP_STRING([--enable-icon-database],
-                             [enable icon database [default=yes]]),
-              [],[enable_icon_database="yes"])
-AC_MSG_RESULT([$enable_icon_database])
-
-# check whether to enable HTML5 iframe seamless attribute support
-AC_MSG_CHECKING([whether to enable HTML5 iframe seamless attribute support])
-AC_ARG_ENABLE(iframe-seamless,
-              AC_HELP_STRING([--enable-iframe-seamless],
-                             [enable HTML5 iframe seamless attribute support [default=yes]]),
-              [],[enable_iframe_seamless="yes"])
-AC_MSG_RESULT([$enable_iframe_seamless])
-
 # check whether to enable HTML5 audio/video support
 AC_MSG_CHECKING([whether to enable HTML5 video support])
 AC_ARG_ENABLE(video,
@@ -700,27 +636,6 @@ AC_ARG_ENABLE(video,
               [],[enable_video="yes"])
 AC_MSG_RESULT([$enable_video])
 
-# turn off video features if --disable-video is requested
-if test "$enable_video" = "no"; then
-   enable_video_track=no
-fi
-
-# check whether to enable HTML5 video track support
-AC_MSG_CHECKING([whether to enable HTML5 video track support])
-AC_ARG_ENABLE(video_track,
-              AC_HELP_STRING([--enable-video-track],
-                             [enable HTML5 video track support [default=no]]),
-              [],[enable_video_track=$enable_unstable_features])
-AC_MSG_RESULT([$enable_video_track])
-
-# check whether to enable Javascript Fullscreen API support
-AC_MSG_CHECKING([whether to enable Fullscreen API support])
-AC_ARG_ENABLE(fullscreen_api,
-              AC_HELP_STRING([--enable-fullscreen-api],
-                             [enable the Fullscreen API support [default=yes]]),
-              [],[enable_fullscreen_api="yes"])
-AC_MSG_RESULT([$enable_fullscreen_api])
-
 # check whether to enable media stream support
 AC_MSG_CHECKING([whether to enable media stream support])
 AC_ARG_ENABLE(media_stream,
@@ -745,22 +660,6 @@ AC_ARG_ENABLE(geolocation,
               [],[enable_geolocation="yes"])
 AC_MSG_RESULT([$enable_geolocation])
 
-# check whether to enable MathML support
-AC_MSG_CHECKING([whether to enable MathML support])
-AC_ARG_ENABLE(mathml,
-              AC_HELP_STRING([--enable-mathml],
-                             [enable support for MathML [default=yes]]),
-              [],[enable_mathml="yes"])
-AC_MSG_RESULT([$enable_mathml])
-
-# check whether to enable MHTML support
-AC_MSG_CHECKING([whether to enable MHTML support])
-AC_ARG_ENABLE(mhtml,
-              AC_HELP_STRING([--enable-mhtml],
-                             [enable support for MHTML [default=yes]]),
-              [],[enable_mhtml="yes"])
-AC_MSG_RESULT([$enable_mhtml])
-
 # check whether to enable SVG support
 AC_MSG_CHECKING([whether to enable SVG support])
 AC_ARG_ENABLE(svg,
@@ -769,43 +668,11 @@ AC_ARG_ENABLE(svg,
               [],[enable_svg="yes"])
 AC_MSG_RESULT([$enable_svg])
 
-# check whether to enable Shadow DOM support
-AC_MSG_CHECKING([whether to enable Shadow DOM support])
-AC_ARG_ENABLE(shadow_dom,
-              AC_HELP_STRING([--enable-shadow-dom],
-                             [enable support for Shadow DOM [default=yes]]),
-              [],[enable_shadow_dom="yes"])
-AC_MSG_RESULT([$enable_shadow_dom])
-
-# check whether to enable SharedWorkers support
-AC_MSG_CHECKING([whether to enable SharedWorkers support])
-AC_ARG_ENABLE(shared_workers,
-              AC_HELP_STRING([--enable-shared-workers],
-                             [enable support for SharedWorkers [default=yes]]),
-              [],[enable_shared_workers="yes"])
-AC_MSG_RESULT([$enable_shared_workers])
-
-# check whether to enable Web Workers support
-AC_MSG_CHECKING([whether to enable Web Workers support])
-AC_ARG_ENABLE(workers,
-              AC_HELP_STRING([--enable-workers],
-                             [enable support for Web Workers [default=yes]]),
-              [],[enable_workers="yes"])
-AC_MSG_RESULT([$enable_workers])
-
 # turn off svg features if --disable-svg is requested
 if test "$enable_svg" = "no"; then
    enable_svg_fonts=no
 fi
 
-# check whether to enable support for CSS box-decoration-break
-AC_MSG_CHECKING([whether to enable support for CSS box-decoration-break])
-AC_ARG_ENABLE(css_box_decoration_break,
-              AC_HELP_STRING([--enable-css-box-decoration-break],
-                             [enable support for CSS box-decoration-break (experimental) [default=yes]]),
-              [],[enable_css_box_decoration_break="yes"])
-AC_MSG_RESULT([$enable_css_box_decoration_break])
-
 # check whether to enable support for filters
 AC_MSG_CHECKING([whether to enable support for filters])
 AC_ARG_ENABLE(filters,
@@ -844,38 +711,6 @@ AC_ARG_ENABLE(web_audio,
               [],[enable_web_audio="no"])
 AC_MSG_RESULT([$enable_web_audio])
 
-# check whether to enable Web Timing support
-AC_MSG_CHECKING([whether to enable Web Timing support])
-AC_ARG_ENABLE(web_timing,
-              AC_HELP_STRING([--enable-web-timing],
-                             [enable support for Web Timing [default=no]]),
-              [],[enable_web_timing=$enable_unstable_features])
-AC_MSG_RESULT([$enable_web_timing])
-
-# check whether to enable Blob support
-AC_MSG_CHECKING([whether to enable Blob support])
-AC_ARG_ENABLE(blob,
-              AC_HELP_STRING([--enable-blob],
-                             [enable support for Blob [default=yes]]),
-              [],[enable_blob="yes"])
-AC_MSG_RESULT([$enable_blob])
-
-# check whether to enable Legacy vendor prefix support
-AC_MSG_CHECKING([whether to enable legacy vendor prefix support])
-AC_ARG_ENABLE(legacy_vendor_prefixes,
-              AC_HELP_STRING([--enable-legacy-vendor-prefixes],
-                             [enable support for legacy vendor prefixes [default=yes]]),
-              [],[enable_legacy_vendor_prefixes="yes"])
-AC_MSG_RESULT([$legacy_vendor_prefixes])
-
-# check whether to enable Legacy WebKitBlobBuilder support
-AC_MSG_CHECKING([whether to enable Legacy WebKitBlobBuilder support])
-AC_ARG_ENABLE(legacy_webkit_blob_builder,
-              AC_HELP_STRING([--enable-legacy-webkit-blob-builder],
-                             [enable support for Legacy WebKitBlobBuilder [default=yes]]),
-              [],[enable_legacy_webkit_blob_builder="yes"])
-AC_MSG_RESULT([$legacy_webkit_blob_builder])
-
 # check whether to enable code coverage
 AC_MSG_CHECKING([whether to enable code coverage support])
 AC_ARG_ENABLE(coverage,
@@ -934,13 +769,6 @@ if test "$enable_opcode_stats" = "yes"; then
   AC_DEFINE([ENABLE_OPCODE_STATS], [1], [Define to enable Opcode statistics])
 fi
 
-# Link prefetch
-AC_MSG_CHECKING([whether to enable link prefetch support])
-AC_ARG_ENABLE([link-prefetch],
-  [AS_HELP_STRING([--enable-link-prefetch], [Enable Link prefetch support (default: disabled)])],
-  [],[enable_link_prefetch=$enable_unstable_features])
-AC_MSG_RESULT([$enable_link_prefetch])
-
 # GObject Introspection
 AC_MSG_CHECKING([whether to enable GObject introspection support])
 AC_ARG_ENABLE([introspection],
@@ -948,30 +776,6 @@ AC_ARG_ENABLE([introspection],
   [],[enable_introspection=no])
 AC_MSG_RESULT([$enable_introspection])
 
-# check whether to enable requestAnimationFrame support
-AC_MSG_CHECKING([whether to enable requestAnimationFrame support])
-AC_ARG_ENABLE(request_animation_frame,
-              AC_HELP_STRING([--enable-request-animation-frame],
-                             [enable support for requestAnimationFrame (experimental) [default=yes]]),
-              [],[enable_request_animation_frame="yes"])
-AC_MSG_RESULT([$enable_request_animation_frame])
-
-# check whether to enable CSS Exclusions support
-AC_MSG_CHECKING([whether to enable CSS Exclusions])
-AC_ARG_ENABLE(css_exclusions,
-              AC_HELP_STRING([--enable-css-exclusions],
-                             [enable support for CSS Exclusions [default=yes]]),
-              [],[enable_css_exclusions="yes"])
-AC_MSG_RESULT([$enable_css_exclusions])
-
-# check whether to enable CSS Regions support
-AC_MSG_CHECKING([whether to enable CSS Regions])
-AC_ARG_ENABLE(css_regions,
-              AC_HELP_STRING([--enable-css-regions],
-                             [enable support for CSS Regions [default=yes]]),
-              [],[enable_css_regions="yes"])
-AC_MSG_RESULT([$enable_css_regions])
-
 # Enable css shaders if unstable_features, css_filters and
 # accelerated_compositing are turned on.
 AC_MSG_CHECKING([whether to enable CSS Shaders])
@@ -1255,46 +1059,21 @@ AM_CONDITIONAL([USE_FARSTREAM], [test "$have_farstream" = "yes"])
 AM_CONDITIONAL([ENABLE_DEBUG],[test "$enable_debug_features" = "yes"])
 AM_CONDITIONAL([ENABLE_UNSTABLE_FEATURES],[test "$enable_unstable_features" = "yes"])
 AM_CONDITIONAL([ENABLE_WEBGL],[test "$enable_webgl" = "yes"])
-AM_CONDITIONAL([ENABLE_BLOB],[test "$enable_blob" = "yes"])
-AM_CONDITIONAL([ENABLE_LEGACY_VENDOR_PREFIXES],[test "$enable_legacy_vendor_prefixes" = "yes"])
-AM_CONDITIONAL([ENABLE_LEGACY_WEBKIT_BLOB_BUILDER],[test "$enable_legacy_webkit_blob_builder" = "yes"])
-AM_CONDITIONAL([ENABLE_METER_ELEMENT],[test "$enable_meter_tag" = "yes"])
-AM_CONDITIONAL([ENABLE_PROGRESS_ELEMENT],[test "$enable_progress_tag" = "yes"])
-AM_CONDITIONAL([ENABLE_CHANNEL_MESSAGING],[test "$enable_channel_messaging" = "yes"])
-AM_CONDITIONAL([ENABLE_JAVASCRIPT_DEBUGGER],[test "$enable_javascript_debugger" = "yes"])
 AM_CONDITIONAL([ENABLE_GAMEPAD],[test "$enable_gamepad" = "yes"])
-AM_CONDITIONAL([ENABLE_SQL_DATABASE],[test "$enable_sql_database" = "yes"])
-AM_CONDITIONAL([ENABLE_ICONDATABASE],[test "$enable_icon_database" = "yes"])
 AM_CONDITIONAL([ENABLE_XSLT],[test "$enable_xslt" = "yes"])
-AM_CONDITIONAL([ENABLE_CSS_BOX_DECORATION_BREAK],[test "$enable_css_box_decoration_break" = "yes"])
 AM_CONDITIONAL([ENABLE_FILTERS],[test "$enable_filters" = "yes"])
 AM_CONDITIONAL([ENABLE_GEOLOCATION], [test "$enable_geolocation" = "yes"])
-AM_CONDITIONAL([ENABLE_MATHML], [test "$enable_mathml" = "yes"])
-AM_CONDITIONAL([ENABLE_MHTML], [test "$enable_mhtml" = "yes"])
 AM_CONDITIONAL([ENABLE_VIDEO],[test "$enable_video" = "yes"])
-AM_CONDITIONAL([ENABLE_VIDEO_TRACK],[test "$enable_video_track" = "yes"])
-AM_CONDITIONAL([ENABLE_FULLSCREEN_API],[test "$enable_fullscreen_api" = "yes"])
 AM_CONDITIONAL([ENABLE_MEDIA_STREAM],[test "$enable_media_stream" = "yes"])
 AM_CONDITIONAL([ENABLE_SVG],[test "$enable_svg" = "yes"])
 AM_CONDITIONAL([ENABLE_SVG_FONTS],[test "$enable_svg_fonts" = "yes"])
 AM_CONDITIONAL([ENABLE_COVERAGE],[test "$enable_coverage" = "yes"])
 AM_CONDITIONAL([ENABLE_FAST_MALLOC],[test "$enable_fast_malloc" = "yes"])
-AM_CONDITIONAL([ENABLE_WORKERS],[test "$enable_workers" = "yes"])
-AM_CONDITIONAL([ENABLE_SHADOW_DOM],[test "$enable_shadow_dom" = "yes"])
-AM_CONDITIONAL([ENABLE_SHARED_WORKERS],[test "$enable_shared_workers" = "yes"])
-AM_CONDITIONAL([ENABLE_WEB_SOCKETS],[test "$enable_web_sockets" = "yes"])
 AM_CONDITIONAL([ENABLE_WEB_AUDIO],[test "$enable_web_audio" = "yes"])
-AM_CONDITIONAL([ENABLE_WEB_TIMING],[test "$enable_web_timing" = "yes"])
 AM_CONDITIONAL([ENABLE_OPCODE_STATS],[test "$enable_opcode_stats" = "yes"])
 AM_CONDITIONAL([ENABLE_WEBKIT2],[test "$enable_webkit2" = "yes"])
 AM_CONDITIONAL([ENABLE_PLUGIN_PROCESS],[test "$enable_plugin_process" = "yes"])
 AM_CONDITIONAL([ENABLE_SPELLCHECK],[test "$enable_spellcheck" = "yes"])
-AM_CONDITIONAL([ENABLE_LINK_PREFETCH],[test "$enable_link_prefetch" = "yes"])
-AM_CONDITIONAL([ENABLE_REQUEST_ANIMATION_FRAME],[test "$enable_request_animation_frame" = "yes"])
-AM_CONDITIONAL([ENABLE_MUTATION_OBSERVERS],[test "$enable_mutation_observers" = "yes"])
-AM_CONDITIONAL([ENABLE_IFRAME_SEAMLESS],[test "$enable_iframe_seamless" = "yes"])
-AM_CONDITIONAL([ENABLE_CSS_EXCLUSIONS],[test "$enable_css_exclusions" = "yes"])
-AM_CONDITIONAL([ENABLE_CSS_REGIONS],[test "$enable_css_regions" = "yes"])
 AM_CONDITIONAL([ENABLE_CSS_FILTERS],[test "$enable_css_filters" = "yes"])
 AM_CONDITIONAL([ENABLE_CSS_SHADERS],[test "$enable_css_shaders" = "yes"])
 
@@ -1351,42 +1130,17 @@ Build configuration:
 Features:
 =======
  Accelerated Compositing                                  : $enable_accelerated_compositing
- Blob support                                             : $enable_blob
- CSS Exclusions support                                   : $enable_css_exclusions
- CSS Regions support                                      : $enable_css_regions
- CSS box-decoration-break support                         : $enable_css_box_decoration_break
- DOM mutation observer support                            : $enable_mutation_observers
  Filters support                                          : $enable_filters
- Fullscreen API support                                   : $enable_fullscreen_api
  Gamepad support                                          : $enable_gamepad
  Geolocation support                                      : $enable_geolocation
- HTML5 channel messaging support                          : $enable_channel_messaging
- HTML5 iframe seamless attribute support                  : $enable_iframe_seamless
- HTML5 meter element support                              : $enable_meter_tag
- HTML5 progress element support                           : $enable_progress_tag
- HTML5 track element support                              : $enable_video_track
  HTML5 video element support                              : $enable_video
- Icon database support                                    : $enable_icon_database
  JIT compilation                                          : $enable_jit
- JavaScript debugger/profiler support                     : $enable_javascript_debugger
- Legacy vendor prefix support                             : $enable_legacy_vendor_prefixes
- Legacy WebKitBlobBuilder support                         : $enable_legacy_webkit_blob_builder
- Link prefetch support                                    : $enable_link_prefetch
- MHTML support                                            : $enable_mhtml
- MathML support                                           : $enable_mathml
  Media stream support                                     : $enable_media_stream
  Opcode stats                                             : $enable_opcode_stats
- RequestAnimationFrame support                            : $enable_request_animation_frame
- SQL client-side database storage support                 : $enable_sql_database
  SVG fonts support                                        : $enable_svg_fonts
  SVG support                                              : $enable_svg
- Shadow DOM support                                       : $enable_shadow_dom
- SharedWorkers support                                    : $enable_shared_workers
  Spellcheck support                                       : $enable_spellcheck
  Web Audio support                                        : $enable_web_audio
- Web Sockets support                                      : $enable_web_sockets
- Web Timing support                                       : $enable_web_timing
- Web Workers support                                      : $enable_workers
  WebGL                                                    : $enable_webgl
  XSLT support                                             : $enable_xslt