Attachment 158479 Details for Bug 93863 – Patch

[patch] Patch

bug-93863-20120814221458.patch (text/plain), 76.01 KB, created by Bruno Abinader (history only) on 2012-08-14 19:15:32 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Bruno Abinader (history only)

Created: 2012-08-14 19:15:32 PDT

Size: 76.01 KB

patch

obsolete

>Subversion Revision: 125634
>diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
>index bf11c816b1adce2c0636c028e5fa77e381cbcb6b..e2b4452cfb962f25fd326edda14ea327a3a49771 100644
>--- a/Source/JavaScriptCore/ChangeLog
>+++ b/Source/JavaScriptCore/ChangeLog
>@@ -1,3 +1,29 @@
>+2012-08-14  Bruno de Oliveira Abinader  <bruno.abinader@basyskom.com>
>+
>+        [css3-text] Add CSS3 Text decoration compile flag
>+        https://bugs.webkit.org/show_bug.cgi?id=93863
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        A series of CSS3 text decoration properties implementations are currently on the
>+        works. These adds new properties which specifications are not finished yet, thus
>+        subject to changes. A new feature flag is required, with its boilerplate
>+        implementation handled in this bug and further bugs related to these
>+        implementations shall take advantage of this flag.
>+
>+        This patch handles the compile flag implementation, which will come disabled by
>+        default, thus not exposing the CSS3 text decoration features to the web, unless
>+        when explicitly enabling it with "--css3-text-decoration" build parameter.
>+
>+        Changeset r125205 added "-webkit-text-decoration-line" support without proper
>+        compile flag. I am fixing this on this patch by adding #ifdef's along the added
>+        code and reverting getComputedStyle* layout test changes until further notice.
>+        The text-decoration-line.html layout test is now moved to
>+        fast/css3-text-decoration directory, which is skipped on all platforms until
>+        feature is sound and ready to be exposed to web.
>+
>+        * Configurations/FeatureDefines.xcconfig:
>+
> 2012-08-14  Gabor Ballabas  <gaborb@inf.u-szeged.hu>
> 
>         Rename functions in the ARM port of DFG-JIT for better code readability.
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index e8c8a40794c2a1f5e0160f2a830fa521c594cb40..5737307fc114fb02f517879fff29c51ee9cbe669 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,45 @@
>+2012-08-14  Bruno de Oliveira Abinader  <bruno.abinader@basyskom.com>
>+
>+        [css3-text] Add CSS3 Text decoration compile flag
>+        https://bugs.webkit.org/show_bug.cgi?id=93863
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        A series of CSS3 text decoration properties implementations are currently on the
>+        works. These adds new properties which specifications are not finished yet, thus
>+        subject to changes. A new feature flag is required, with its boilerplate
>+        implementation handled in this bug and further bugs related to these
>+        implementations shall take advantage of this flag.
>+
>+        This patch handles the compile flag implementation, which will come disabled by
>+        default, thus not exposing the CSS3 text decoration features to the web, unless
>+        when explicitly enabling it with "--css3-text-decoration" build parameter.
>+
>+        Changeset r125205 added "-webkit-text-decoration-line" support without proper
>+        compile flag. I am fixing this on this patch by adding #ifdef's along the added
>+        code and reverting getComputedStyle* layout test changes until further notice.
>+        The text-decoration-line.html layout test is now moved to
>+        fast/css3-text-decoration directory, which is skipped on all platforms until
>+        feature is sound and ready to be exposed to web.
>+
>+        Test: fast/css3-text-decoration/text-decoration-line.html
>+
>+        * Configurations/FeatureDefines.xcconfig:
>+        * GNUmakefile.am:
>+        * css/CSSComputedStyleDeclaration.cpp: Added missing #ifdef's.
>+        (WebCore::CSSComputedStyleDeclaration::getPropertyCSSValue):
>+        * css/CSSParser.cpp: Added missing #ifdef's.
>+        (WebCore::CSSParser::parseValue):
>+        (WebCore::CSSParser::addTextDecorationProperty):
>+        (WebCore::CSSParser::parseTextDecoration):
>+        * css/CSSProperty.cpp: Added missing #ifdef's.
>+        (WebCore::CSSProperty::isInheritedProperty):
>+        * css/CSSPropertyNames.in: Added missing #ifdef's.
>+        * css/StyleBuilder.cpp: Added missing #ifdef's.
>+        (WebCore::StyleBuilder::StyleBuilder):
>+        * css/StyleResolver.cpp: Added missing #ifdef's.
>+        (WebCore::StyleResolver::collectMatchingRulesForList):
>+
> 2012-08-14  Yoshifumi Inoue  <yosin@chromium.org>
> 
>         [Forms] Make input type "time" to use multiple field time input UI
>diff --git a/Source/WebKit/chromium/ChangeLog b/Source/WebKit/chromium/ChangeLog
>index 2678bb1d244903068aa556e802fbc2e06db413a6..d3b941520e3e5f0fd03e8d509534af9016356043 100644
>--- a/Source/WebKit/chromium/ChangeLog
>+++ b/Source/WebKit/chromium/ChangeLog
>@@ -1,3 +1,29 @@
>+2012-08-14  Bruno de Oliveira Abinader  <bruno.abinader@basyskom.com>
>+
>+        [css3-text] Add CSS3 Text decoration compile flag
>+        https://bugs.webkit.org/show_bug.cgi?id=93863
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        A series of CSS3 text decoration properties implementations are currently on the
>+        works. These adds new properties which specifications are not finished yet, thus
>+        subject to changes. A new feature flag is required, with its boilerplate
>+        implementation handled in this bug and further bugs related to these
>+        implementations shall take advantage of this flag.
>+
>+        This patch handles the compile flag implementation, which will come disabled by
>+        default, thus not exposing the CSS3 text decoration features to the web, unless
>+        when explicitly enabling it with "--css3-text-decoration" build parameter.
>+
>+        Changeset r125205 added "-webkit-text-decoration-line" support without proper
>+        compile flag. I am fixing this on this patch by adding #ifdef's along the added
>+        code and reverting getComputedStyle* layout test changes until further notice.
>+        The text-decoration-line.html layout test is now moved to
>+        fast/css3-text-decoration directory, which is skipped on all platforms until
>+        feature is sound and ready to be exposed to web.
>+
>+        * features.gypi:
>+
> 2012-08-14  Scott Graham  <scottmg@chromium.org>
> 
>         [Chromium] Fix warnings on Windows build
>diff --git a/Source/WebKit/mac/ChangeLog b/Source/WebKit/mac/ChangeLog
>index b3ad15c73c2ccaf34be3d512555e652616f1933b..a9118c2aab1177d64096398bfca917554ab73a49 100644
>--- a/Source/WebKit/mac/ChangeLog
>+++ b/Source/WebKit/mac/ChangeLog
>@@ -1,3 +1,29 @@
>+2012-08-14  Bruno de Oliveira Abinader  <bruno.abinader@basyskom.com>
>+
>+        [css3-text] Add CSS3 Text decoration compile flag
>+        https://bugs.webkit.org/show_bug.cgi?id=93863
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        A series of CSS3 text decoration properties implementations are currently on the
>+        works. These adds new properties which specifications are not finished yet, thus
>+        subject to changes. A new feature flag is required, with its boilerplate
>+        implementation handled in this bug and further bugs related to these
>+        implementations shall take advantage of this flag.
>+
>+        This patch handles the compile flag implementation, which will come disabled by
>+        default, thus not exposing the CSS3 text decoration features to the web, unless
>+        when explicitly enabling it with "--css3-text-decoration" build parameter.
>+
>+        Changeset r125205 added "-webkit-text-decoration-line" support without proper
>+        compile flag. I am fixing this on this patch by adding #ifdef's along the added
>+        code and reverting getComputedStyle* layout test changes until further notice.
>+        The text-decoration-line.html layout test is now moved to
>+        fast/css3-text-decoration directory, which is skipped on all platforms until
>+        feature is sound and ready to be exposed to web.
>+
>+        * Configurations/FeatureDefines.xcconfig:
>+
> 2012-08-14  Adam Barth  <abarth@webkit.org>
> 
>         Delete Frame::domWindow() and Frame::existingDOMWindow()
>diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
>index 9a2df1d815cb0ceb7136f25a9e6adf8d77141ab3..25311bed9db8d6eb0c4013d0981a1c834039db00 100644
>--- a/Source/WebKit2/ChangeLog
>+++ b/Source/WebKit2/ChangeLog
>@@ -1,3 +1,29 @@
>+2012-08-14  Bruno de Oliveira Abinader  <bruno.abinader@basyskom.com>
>+
>+        [css3-text] Add CSS3 Text decoration compile flag
>+        https://bugs.webkit.org/show_bug.cgi?id=93863
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        A series of CSS3 text decoration properties implementations are currently on the
>+        works. These adds new properties which specifications are not finished yet, thus
>+        subject to changes. A new feature flag is required, with its boilerplate
>+        implementation handled in this bug and further bugs related to these
>+        implementations shall take advantage of this flag.
>+
>+        This patch handles the compile flag implementation, which will come disabled by
>+        default, thus not exposing the CSS3 text decoration features to the web, unless
>+        when explicitly enabling it with "--css3-text-decoration" build parameter.
>+
>+        Changeset r125205 added "-webkit-text-decoration-line" support without proper
>+        compile flag. I am fixing this on this patch by adding #ifdef's along the added
>+        code and reverting getComputedStyle* layout test changes until further notice.
>+        The text-decoration-line.html layout test is now moved to
>+        fast/css3-text-decoration directory, which is skipped on all platforms until
>+        feature is sound and ready to be exposed to web.
>+
>+        * Configurations/FeatureDefines.xcconfig:
>+
> 2012-08-14  Adam Barth  <abarth@webkit.org>
> 
>         Delete Frame::domWindow() and Frame::existingDOMWindow()
>diff --git a/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig b/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig
>index 40d95cb9cdfaddbb9487bb4c2af89b853e725ba1..9c1b8ffa71aa65a4dbe7d281a0052d40ea6e9f50 100644
>--- a/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig
>+++ b/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig
>@@ -48,6 +48,7 @@ ENABLE_CSS_COMPOSITING = ;
> ENABLE_CSS_STICKY_POSITION = ENABLE_CSS_STICKY_POSITION;
> ENABLE_CSS_VARIABLES = ;
> ENABLE_CSS3_FLEXBOX = ENABLE_CSS3_FLEXBOX;
>+ENABLE_CSS3_TEXT_DECORATION = ;
> ENABLE_CUSTOM_SCHEME_HANDLER = ;
> ENABLE_DASHBOARD_SUPPORT = $(ENABLE_DASHBOARD_SUPPORT_$(REAL_PLATFORM_NAME));
> ENABLE_DASHBOARD_SUPPORT_macosx = ENABLE_DASHBOARD_SUPPORT;
>@@ -139,4 +140,4 @@ ENABLE_WIDGET_REGION_macosx = ENABLE_WIDGET_REGION;
> ENABLE_WORKERS = ENABLE_WORKERS;
> ENABLE_XSLT = ENABLE_XSLT;
> 
>-FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ANIMATION_API) $(ENABLE_BLOB) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_EXCLUSIONS) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_HIERARCHIES) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SHADERS) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_STICKY_POSITION) $(ENABLE_CSS_VARIABLES) $(ENABLE_CSS3_FLEXBOX) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIALOG_ELEMENT) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_FILE_SYSTEM) $(ENABLE_FILTERS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_HIGH_DPI_CANVAS) $(ENABLE_ICONDATABASE) $(ENABLE_IFRAME_SEAMLESS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LINK_PREFETCH) $(ENABLE_LINK_PRERENDER) $(ENABLE_MATHML) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MICRODATA) $(ENABLE_MUTATION_OBSERVERS) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PROGRESS_ELEMENT) $(ENABLE_QUOTA) $(ENABLE_REGISTER_PROTOCOL_HANDLER) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_SCRIPTED_SPEECH) $(ENABLE_SHADOW_DOM) $(ENABLE_SHARED_WORKERS) $(ENABLE_SQL_DATABASE) $(ENABLE_STYLE_SCOPED) $(ENABLE_SVG) $(ENABLE_SVG_DOM_OBJC_BINDINGS) $(ENABLE_SVG_FONTS) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TEXT_NOTIFICATIONS_ONLY) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_UNDO_MANAGER) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WIDGET_REGION) $(ENABLE_WORKERS) $(ENABLE_XSLT);
>+FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ANIMATION_API) $(ENABLE_BLOB) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_EXCLUSIONS) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_HIERARCHIES) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SHADERS) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_STICKY_POSITION) $(ENABLE_CSS_VARIABLES) $(ENABLE_CSS3_FLEXBOX) $(ENABLE_CSS3_TEXT_DECORATION) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIALOG_ELEMENT) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_FILE_SYSTEM) $(ENABLE_FILTERS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_HIGH_DPI_CANVAS) $(ENABLE_ICONDATABASE) $(ENABLE_IFRAME_SEAMLESS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LINK_PREFETCH) $(ENABLE_LINK_PRERENDER) $(ENABLE_MATHML) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MICRODATA) $(ENABLE_MUTATION_OBSERVERS) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PROGRESS_ELEMENT) $(ENABLE_QUOTA) $(ENABLE_REGISTER_PROTOCOL_HANDLER) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_SCRIPTED_SPEECH) $(ENABLE_SHADOW_DOM) $(ENABLE_SHARED_WORKERS) $(ENABLE_SQL_DATABASE) $(ENABLE_STYLE_SCOPED) $(ENABLE_SVG) $(ENABLE_SVG_DOM_OBJC_BINDINGS) $(ENABLE_SVG_FONTS) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TEXT_NOTIFICATIONS_ONLY) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_UNDO_MANAGER) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WIDGET_REGION) $(ENABLE_WORKERS) $(ENABLE_XSLT);
>diff --git a/Source/WebCore/Configurations/FeatureDefines.xcconfig b/Source/WebCore/Configurations/FeatureDefines.xcconfig
>index 10257077c37ab97b1840260dada742c312b8e9e2..cedd95d76d83aee1b3fff0887682af4e8a38423d 100644
>--- a/Source/WebCore/Configurations/FeatureDefines.xcconfig
>+++ b/Source/WebCore/Configurations/FeatureDefines.xcconfig
>@@ -49,6 +49,7 @@ ENABLE_CSS_COMPOSITING = ;
> ENABLE_CSS_STICKY_POSITION = ENABLE_CSS_STICKY_POSITION;
> ENABLE_CSS_VARIABLES = ;
> ENABLE_CSS3_FLEXBOX = ENABLE_CSS3_FLEXBOX;
>+ENABLE_CSS3_TEXT_DECORATION = ;
> ENABLE_CUSTOM_SCHEME_HANDLER = ;
> ENABLE_DASHBOARD_SUPPORT = $(ENABLE_DASHBOARD_SUPPORT_$(REAL_PLATFORM_NAME));
> ENABLE_DASHBOARD_SUPPORT_macosx = ENABLE_DASHBOARD_SUPPORT;
>@@ -140,4 +141,4 @@ ENABLE_WIDGET_REGION_macosx = ENABLE_WIDGET_REGION;
> ENABLE_WORKERS = ENABLE_WORKERS;
> ENABLE_XSLT = ENABLE_XSLT;
> 
>-FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ANIMATION_API) $(ENABLE_BLOB) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_EXCLUSIONS) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_HIERARCHIES) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SHADERS) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_STICKY_POSITION) $(ENABLE_CSS_VARIABLES) $(ENABLE_CSS3_FLEXBOX) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIALOG_ELEMENT) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_FILE_SYSTEM) $(ENABLE_FILTERS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_HIGH_DPI_CANVAS) $(ENABLE_ICONDATABASE) $(ENABLE_IFRAME_SEAMLESS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LINK_PREFETCH) $(ENABLE_LINK_PRERENDER) $(ENABLE_MATHML) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MICRODATA) $(ENABLE_MUTATION_OBSERVERS) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PROGRESS_ELEMENT) $(ENABLE_QUOTA) $(ENABLE_REGISTER_PROTOCOL_HANDLER) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_SCRIPTED_SPEECH) $(ENABLE_SHADOW_DOM) $(ENABLE_SHARED_WORKERS) $(ENABLE_SQL_DATABASE) $(ENABLE_STYLE_SCOPED) $(ENABLE_SVG) $(ENABLE_SVG_DOM_OBJC_BINDINGS) $(ENABLE_SVG_FONTS) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TEXT_NOTIFICATIONS_ONLY) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_UNDO_MANAGER) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WIDGET_REGION) $(ENABLE_WORKERS) $(ENABLE_XSLT);
>+FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ANIMATION_API) $(ENABLE_BLOB) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_EXCLUSIONS) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_HIERARCHIES) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SHADERS) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_STICKY_POSITION) $(ENABLE_CSS_VARIABLES) $(ENABLE_CSS3_FLEXBOX) $(ENABLE_CSS3_TEXT_DECORATION) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIALOG_ELEMENT) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_FILE_SYSTEM) $(ENABLE_FILTERS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_HIGH_DPI_CANVAS) $(ENABLE_ICONDATABASE) $(ENABLE_IFRAME_SEAMLESS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LINK_PREFETCH) $(ENABLE_LINK_PRERENDER) $(ENABLE_MATHML) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MICRODATA) $(ENABLE_MUTATION_OBSERVERS) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PROGRESS_ELEMENT) $(ENABLE_QUOTA) $(ENABLE_REGISTER_PROTOCOL_HANDLER) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_SCRIPTED_SPEECH) $(ENABLE_SHADOW_DOM) $(ENABLE_SHARED_WORKERS) $(ENABLE_SQL_DATABASE) $(ENABLE_STYLE_SCOPED) $(ENABLE_SVG) $(ENABLE_SVG_DOM_OBJC_BINDINGS) $(ENABLE_SVG_FONTS) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TEXT_NOTIFICATIONS_ONLY) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_UNDO_MANAGER) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WIDGET_REGION) $(ENABLE_WORKERS) $(ENABLE_XSLT);
>diff --git a/Source/WebCore/GNUmakefile.am b/Source/WebCore/GNUmakefile.am
>index d6b6eb31a1d76773eeb6cc237033558371923b22..f9eab24418653ed53296dbf20b936a7d3e58b4bf 100644
>--- a/Source/WebCore/GNUmakefile.am
>+++ b/Source/WebCore/GNUmakefile.am
>@@ -722,6 +722,13 @@ webcore_cppflags += -DENABLE_CSS3_FLEXBOX=1
> endif  # END ENABLE_CSS3_FLEXBOX
> 
> # ---
>+# CSS3 Text Decoration support
>+if ENABLE_CSS3_TEXT_DECORATION
>+FEATURE_DEFINES += ENABLE_CSS3_TEXT_DECORATION=1
>+webcore_cppflags += -DENABLE_CSS3_TEXT_DECORATION=1
>+endif # END ENABLE_CSS3_TEXT_DECORATION
>+
>+# ---
> # Link prefetch support
> # ---
> if ENABLE_LINK_PREFETCH
>diff --git a/Source/WebCore/css/CSSComputedStyleDeclaration.cpp b/Source/WebCore/css/CSSComputedStyleDeclaration.cpp
>index b907ab3531deea075179a1e319c3da5a7284f7d2..a78d1fc10af979bfb1640bfadd07b21bf19157ea 100644
>--- a/Source/WebCore/css/CSSComputedStyleDeclaration.cpp
>+++ b/Source/WebCore/css/CSSComputedStyleDeclaration.cpp
>@@ -177,7 +177,9 @@ static const CSSPropertyID computedProperties[] = {
>     CSSPropertyTabSize,
>     CSSPropertyTextAlign,
>     CSSPropertyTextDecoration,
>+#if ENABLE(CSS3_TEXT_DECORATION)
>     CSSPropertyWebkitTextDecorationLine,
>+#endif // CSS3_TEXT_DECORATION
>     CSSPropertyTextIndent,
>     CSSPropertyTextRendering,
>     CSSPropertyTextShadow,
>@@ -1949,7 +1951,9 @@ PassRefPtr<CSSValue> CSSComputedStyleDeclaration::getPropertyCSSValue(CSSPropert
>         case CSSPropertyTextAlign:
>             return cssValuePool().createValue(style->textAlign());
>         case CSSPropertyTextDecoration:
>+#if ENABLE(CSS3_TEXT_DECORATION)
>         case CSSPropertyWebkitTextDecorationLine:
>+#endif // CSS3_TEXT_DECORATION
>             return renderTextDecorationFlagsToCSSValue(style->textDecoration());
>         case CSSPropertyWebkitTextDecorationsInEffect:
>             return renderTextDecorationFlagsToCSSValue(style->textDecorationsInEffect());
>diff --git a/Source/WebCore/css/CSSParser.cpp b/Source/WebCore/css/CSSParser.cpp
>index 7e4b277135ba3813a287b06240ba82e2073a6835..a21013ad171c1bed66df260f59ef60a3832d99f5 100644
>--- a/Source/WebCore/css/CSSParser.cpp
>+++ b/Source/WebCore/css/CSSParser.cpp
>@@ -2104,9 +2104,11 @@ bool CSSParser::parseValue(CSSPropertyID propId, bool important)
>         // none | [ underline || overline || line-through || blink ] | inherit
>         return parseTextDecoration(propId, important);
> 
>+#if ENABLE(CSS3_TEXT_DECORATION)
>     case CSSPropertyWebkitTextDecorationLine:
>         // none | [ underline || overline || line-through ] | inherit
>         return parseTextDecoration(propId, important);
>+#endif // CSS3_TEXT_DECORATION
> 
>     case CSSPropertyZoom:          // normal | reset | document | <number> | <percentage> | inherit
>         if (id == CSSValueNormal || id == CSSValueReset || id == CSSValueDocument)
>@@ -7916,6 +7918,7 @@ bool CSSParser::parsePerspectiveOrigin(CSSPropertyID propId, CSSPropertyID& prop
> 
> void CSSParser::addTextDecorationProperty(CSSPropertyID propId, PassRefPtr<CSSValue> value, bool important)
> {
>+#if ENABLE(CSS3_TEXT_DECORATION)
>     // The text-decoration-line property takes priority over text-decoration, unless the latter has important priority set.
>     if (propId == CSSPropertyTextDecoration && !important && m_currentShorthand == CSSPropertyInvalid) {
>         for (unsigned i = 0; i < m_parsedProperties->size(); ++i) {
>@@ -7923,6 +7926,7 @@ void CSSParser::addTextDecorationProperty(CSSPropertyID propId, PassRefPtr<CSSVa
>                 return;
>         }
>     }
>+#endif // CSS3_TEXT_DECORATION
>     addProperty(propId, value, important);
> }
> 
>@@ -7940,9 +7944,11 @@ bool CSSParser::parseTextDecoration(CSSPropertyID propId, bool important)
>     while (isValid && value) {
>         switch (value->id) {
>         case CSSValueBlink:
>+#if ENABLE(CSS3_TEXT_DECORATION)
>             // Blink value is not accepted by -webkit-text-decoration-line.
>             isValid = propId != CSSPropertyWebkitTextDecorationLine;
>             break;
>+#endif // CSS3_TEXT_DECORATION
>         case CSSValueUnderline:
>         case CSSValueOverline:
>         case CSSValueLineThrough:
>diff --git a/Source/WebCore/css/CSSProperty.cpp b/Source/WebCore/css/CSSProperty.cpp
>index 0b87cea3069e0872d1c55c48c12dc4d0d28775b5..f48e9f045b58c300cb4b5e61e821c994bdfbf016 100644
>--- a/Source/WebCore/css/CSSProperty.cpp
>+++ b/Source/WebCore/css/CSSProperty.cpp
>@@ -340,7 +340,9 @@ bool CSSProperty::isInheritedProperty(CSSPropertyID propertyID)
>     case CSSPropertyWebkitPrintColorAdjust:
>     case CSSPropertyWebkitRtlOrdering:
>     case CSSPropertyWebkitTextCombine:
>+#if ENABLE(CSS3_TEXT_DECORATION)
>     case CSSPropertyWebkitTextDecorationLine:
>+#endif // CSS3_TEXT_DECORATION
>     case CSSPropertyWebkitTextDecorationsInEffect:
>     case CSSPropertyWebkitTextEmphasis:
>     case CSSPropertyWebkitTextEmphasisColor:
>diff --git a/Source/WebCore/css/CSSPropertyNames.in b/Source/WebCore/css/CSSPropertyNames.in
>index 0ee20df2b28f0496966c1eafaea0ece04fa983b1..ba4bcce65a59be2c8932bf852eaa8f5ede988171 100644
>--- a/Source/WebCore/css/CSSPropertyNames.in
>+++ b/Source/WebCore/css/CSSPropertyNames.in
>@@ -351,7 +351,9 @@ z-index
> -webkit-rtl-ordering
> -webkit-text-combine
> -epub-text-combine = -webkit-text-combine
>+#if defined(ENABLE_CSS3_TEXT_DECORATION) && ENABLE_CSS3_TEXT_DECORATION
> -webkit-text-decoration-line
>+#endif
> -webkit-text-decorations-in-effect
> -webkit-text-emphasis
> -epub-text-emphasis = -webkit-text-emphasis
>diff --git a/Source/WebCore/css/StyleBuilder.cpp b/Source/WebCore/css/StyleBuilder.cpp
>index 15174d21c8433b9aba9aa30190a8f71a76f78afe..ca9a047cfad83f742db87559efb9575ef6e2be08 100644
>--- a/Source/WebCore/css/StyleBuilder.cpp
>+++ b/Source/WebCore/css/StyleBuilder.cpp
>@@ -1932,7 +1932,9 @@ StyleBuilder::StyleBuilder()
>     setPropertyHandler(CSSPropertyTabSize, ApplyPropertyDefault<unsigned, &RenderStyle::tabSize, unsigned, &RenderStyle::setTabSize, unsigned, &RenderStyle::initialTabSize>::createHandler());
>     setPropertyHandler(CSSPropertyTextAlign, ApplyPropertyTextAlign::createHandler());
>     setPropertyHandler(CSSPropertyTextDecoration, ApplyPropertyTextDecoration::createHandler());
>+#if ENABLE(CSS3_TEXT_DECORATION)
>     setPropertyHandler(CSSPropertyWebkitTextDecorationLine, ApplyPropertyTextDecoration::createHandler());
>+#endif // CSS3_TEXT_DECORATION
>     setPropertyHandler(CSSPropertyTextIndent, ApplyPropertyLength<&RenderStyle::textIndent, &RenderStyle::setTextIndent, &RenderStyle::initialTextIndent>::createHandler());
>     setPropertyHandler(CSSPropertyTextOverflow, ApplyPropertyDefault<TextOverflow, &RenderStyle::textOverflow, TextOverflow, &RenderStyle::setTextOverflow, TextOverflow, &RenderStyle::initialTextOverflow>::createHandler());
>     setPropertyHandler(CSSPropertyTextRendering, ApplyPropertyFont<TextRenderingMode, &FontDescription::textRenderingMode, &FontDescription::setTextRenderingMode, AutoTextRendering>::createHandler());
>diff --git a/Source/WebCore/css/StyleResolver.cpp b/Source/WebCore/css/StyleResolver.cpp
>index b1edfd02b1f843112aec28d0b35d6fe277a84b17..f784b4c909220f74850536fad6a6dbc316d9274e 100644
>--- a/Source/WebCore/css/StyleResolver.cpp
>+++ b/Source/WebCore/css/StyleResolver.cpp
>@@ -4404,7 +4404,9 @@ void StyleResolver::applyProperty(CSSPropertyID id, CSSValue* value)
> #endif
>     case CSSPropertyWebkitRtlOrdering:
>     case CSSPropertyWebkitTextCombine:
>+#if ENABLE(CSS3_TEXT_DECORATION)
>     case CSSPropertyWebkitTextDecorationLine:
>+#endif // CSS3_TEXT_DECORATION
>     case CSSPropertyWebkitTextEmphasisColor:
>     case CSSPropertyWebkitTextEmphasisPosition:
>     case CSSPropertyWebkitTextEmphasisStyle:
>diff --git a/Source/WebKit/chromium/features.gypi b/Source/WebKit/chromium/features.gypi
>index 8dc7e2f6f6528cfafa5442f0f1e91fe6f40a0fcd..5944deb97a6a4b13b097c62d5ed178bea6466ca9 100644
>--- a/Source/WebKit/chromium/features.gypi
>+++ b/Source/WebKit/chromium/features.gypi
>@@ -39,6 +39,7 @@
>       'ENABLE_CHANNEL_MESSAGING=1',
>       'ENABLE_CSP_NEXT=1',
>       'ENABLE_CSS3_FLEXBOX=1',
>+      'ENABLE_CSS3_TEXT_DECORATION=0',
>       'ENABLE_CSS_BOX_DECORATION_BREAK=1',
>       'ENABLE_CSS_COMPOSITING=0',
>       'ENABLE_CSS_EXCLUSIONS=1',
>diff --git a/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig b/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig
>index 10257077c37ab97b1840260dada742c312b8e9e2..cedd95d76d83aee1b3fff0887682af4e8a38423d 100644
>--- a/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig
>+++ b/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig
>@@ -49,6 +49,7 @@ ENABLE_CSS_COMPOSITING = ;
> ENABLE_CSS_STICKY_POSITION = ENABLE_CSS_STICKY_POSITION;
> ENABLE_CSS_VARIABLES = ;
> ENABLE_CSS3_FLEXBOX = ENABLE_CSS3_FLEXBOX;
>+ENABLE_CSS3_TEXT_DECORATION = ;
> ENABLE_CUSTOM_SCHEME_HANDLER = ;
> ENABLE_DASHBOARD_SUPPORT = $(ENABLE_DASHBOARD_SUPPORT_$(REAL_PLATFORM_NAME));
> ENABLE_DASHBOARD_SUPPORT_macosx = ENABLE_DASHBOARD_SUPPORT;
>@@ -140,4 +141,4 @@ ENABLE_WIDGET_REGION_macosx = ENABLE_WIDGET_REGION;
> ENABLE_WORKERS = ENABLE_WORKERS;
> ENABLE_XSLT = ENABLE_XSLT;
> 
>-FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ANIMATION_API) $(ENABLE_BLOB) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_EXCLUSIONS) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_HIERARCHIES) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SHADERS) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_STICKY_POSITION) $(ENABLE_CSS_VARIABLES) $(ENABLE_CSS3_FLEXBOX) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIALOG_ELEMENT) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_FILE_SYSTEM) $(ENABLE_FILTERS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_HIGH_DPI_CANVAS) $(ENABLE_ICONDATABASE) $(ENABLE_IFRAME_SEAMLESS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LINK_PREFETCH) $(ENABLE_LINK_PRERENDER) $(ENABLE_MATHML) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MICRODATA) $(ENABLE_MUTATION_OBSERVERS) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PROGRESS_ELEMENT) $(ENABLE_QUOTA) $(ENABLE_REGISTER_PROTOCOL_HANDLER) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_SCRIPTED_SPEECH) $(ENABLE_SHADOW_DOM) $(ENABLE_SHARED_WORKERS) $(ENABLE_SQL_DATABASE) $(ENABLE_STYLE_SCOPED) $(ENABLE_SVG) $(ENABLE_SVG_DOM_OBJC_BINDINGS) $(ENABLE_SVG_FONTS) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TEXT_NOTIFICATIONS_ONLY) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_UNDO_MANAGER) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WIDGET_REGION) $(ENABLE_WORKERS) $(ENABLE_XSLT);
>+FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ANIMATION_API) $(ENABLE_BLOB) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_EXCLUSIONS) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_HIERARCHIES) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SHADERS) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_STICKY_POSITION) $(ENABLE_CSS_VARIABLES) $(ENABLE_CSS3_FLEXBOX) $(ENABLE_CSS3_TEXT_DECORATION) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIALOG_ELEMENT) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_FILE_SYSTEM) $(ENABLE_FILTERS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_HIGH_DPI_CANVAS) $(ENABLE_ICONDATABASE) $(ENABLE_IFRAME_SEAMLESS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LINK_PREFETCH) $(ENABLE_LINK_PRERENDER) $(ENABLE_MATHML) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MICRODATA) $(ENABLE_MUTATION_OBSERVERS) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PROGRESS_ELEMENT) $(ENABLE_QUOTA) $(ENABLE_REGISTER_PROTOCOL_HANDLER) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_SCRIPTED_SPEECH) $(ENABLE_SHADOW_DOM) $(ENABLE_SHARED_WORKERS) $(ENABLE_SQL_DATABASE) $(ENABLE_STYLE_SCOPED) $(ENABLE_SVG) $(ENABLE_SVG_DOM_OBJC_BINDINGS) $(ENABLE_SVG_FONTS) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TEXT_NOTIFICATIONS_ONLY) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_UNDO_MANAGER) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WIDGET_REGION) $(ENABLE_WORKERS) $(ENABLE_XSLT);
>diff --git a/Source/WebKit2/Configurations/FeatureDefines.xcconfig b/Source/WebKit2/Configurations/FeatureDefines.xcconfig
>index 1da0cc82f5ee922936defede11559b04b029295d..16ce00e8a4fa629bac7b30c556dd2b39321e9eda 100644
>--- a/Source/WebKit2/Configurations/FeatureDefines.xcconfig
>+++ b/Source/WebKit2/Configurations/FeatureDefines.xcconfig
>@@ -48,6 +48,7 @@ ENABLE_CSS_SHADERS = ENABLE_CSS_SHADERS;
> ENABLE_CSS_STICKY_POSITION = ENABLE_CSS_STICKY_POSITION;
> ENABLE_CSS_VARIABLES = ;
> ENABLE_CSS3_FLEXBOX = ENABLE_CSS3_FLEXBOX;
>+ENABLE_CSS3_TEXT_DECORATION = ;
> ENABLE_CUSTOM_SCHEME_HANDLER = ;
> ENABLE_DASHBOARD_SUPPORT = $(ENABLE_DASHBOARD_SUPPORT_$(REAL_PLATFORM_NAME));
> ENABLE_DASHBOARD_SUPPORT_macosx = ENABLE_DASHBOARD_SUPPORT;
>@@ -139,4 +140,4 @@ ENABLE_WIDGET_REGION_macosx = ENABLE_WIDGET_REGION;
> ENABLE_WORKERS = ENABLE_WORKERS;
> ENABLE_XSLT = ENABLE_XSLT;
> 
>-FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ANIMATION_API) $(ENABLE_BLOB) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_EXCLUSIONS) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_HIERARCHIES) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SHADERS) $(ENABLE_CSS_STICKY_POSITION) $(ENABLE_CSS_VARIABLES) $(ENABLE_CSS3_FLEXBOX) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIALOG_ELEMENT) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_FILE_SYSTEM) $(ENABLE_FILTERS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_HIGH_DPI_CANVAS) $(ENABLE_ICONDATABASE) $(ENABLE_IFRAME_SEAMLESS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LINK_PREFETCH) $(ENABLE_LINK_PRERENDER) $(ENABLE_MATHML) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MICRODATA) $(ENABLE_MUTATION_OBSERVERS) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PROGRESS_ELEMENT) $(ENABLE_QUOTA) $(ENABLE_REGISTER_PROTOCOL_HANDLER) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_SCRIPTED_SPEECH) $(ENABLE_SHADOW_DOM) $(ENABLE_SHARED_WORKERS) $(ENABLE_SQL_DATABASE) $(ENABLE_STYLE_SCOPED) $(ENABLE_SVG) $(ENABLE_SVG_DOM_OBJC_BINDINGS) $(ENABLE_SVG_FONTS) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TEXT_NOTIFICATIONS_ONLY) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_UNDO_MANAGER) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WIDGET_REGION) $(ENABLE_WORKERS) $(ENABLE_XSLT);
>+FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ANIMATION_API) $(ENABLE_BLOB) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_EXCLUSIONS) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_HIERARCHIES) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SHADERS) $(ENABLE_CSS_STICKY_POSITION) $(ENABLE_CSS_VARIABLES) $(ENABLE_CSS3_FLEXBOX) $(ENABLE_CSS3_TEXT_DECORATION) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIALOG_ELEMENT) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_FILE_SYSTEM) $(ENABLE_FILTERS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_HIGH_DPI_CANVAS) $(ENABLE_ICONDATABASE) $(ENABLE_IFRAME_SEAMLESS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LINK_PREFETCH) $(ENABLE_LINK_PRERENDER) $(ENABLE_MATHML) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MICRODATA) $(ENABLE_MUTATION_OBSERVERS) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PROGRESS_ELEMENT) $(ENABLE_QUOTA) $(ENABLE_REGISTER_PROTOCOL_HANDLER) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_SCRIPTED_SPEECH) $(ENABLE_SHADOW_DOM) $(ENABLE_SHARED_WORKERS) $(ENABLE_SQL_DATABASE) $(ENABLE_STYLE_SCOPED) $(ENABLE_SVG) $(ENABLE_SVG_DOM_OBJC_BINDINGS) $(ENABLE_SVG_FONTS) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TEXT_NOTIFICATIONS_ONLY) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_UNDO_MANAGER) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WIDGET_REGION) $(ENABLE_WORKERS) $(ENABLE_XSLT);
>diff --git a/Source/cmake/WebKitFeatures.cmake b/Source/cmake/WebKitFeatures.cmake
>index 23bf1447b1c356432e0a3fa067004be35402012e..7eaba01e34eabca073db3c983191ad5ce5672c66 100644
>--- a/Source/cmake/WebKitFeatures.cmake
>+++ b/Source/cmake/WebKitFeatures.cmake
>@@ -21,6 +21,7 @@ MACRO (WEBKIT_OPTION_BEGIN)
>     WEBKIT_OPTION_DEFINE(ENABLE_CHANNEL_MESSAGING "Toggle MessageChannel and MessagePort support" ON)
>     WEBKIT_OPTION_DEFINE(ENABLE_CSP_NEXT "Toggle Content Security Policy 1.1 support" OFF)
>     WEBKIT_OPTION_DEFINE(ENABLE_CSS3_FLEXBOX "Toggle CSS3 Flexbox support" ON)
>+    WEBKIT_OPTION_DEFINE(ENABLE_CSS3_TEXT_DECORATION "Toggle CSS3 Text Decoration support" OFF)
>     WEBKIT_OPTION_DEFINE(ENABLE_CSS_BOX_DECORATION_BREAK "Toggle Box Decoration Break (CSS Backgrounds and Borders) support" ON)
>     WEBKIT_OPTION_DEFINE(ENABLE_CSS_COMPOSITING "Toggle CSS COMPOSITING support" OFF)
>     WEBKIT_OPTION_DEFINE(ENABLE_CSS_EXCLUSIONS "Toggle CSS Exclusion support" OFF)
>diff --git a/Source/cmakeconfig.h.cmake b/Source/cmakeconfig.h.cmake
>index df8cb176c41614010f1f4f6ed570f30593fb0e50..0765f751c173e2454adf25bc32befaeee2d4923d 100644
>--- a/Source/cmakeconfig.h.cmake
>+++ b/Source/cmakeconfig.h.cmake
>@@ -25,6 +25,7 @@
> #cmakedefine01 ENABLE_CSS_STICKY_POSITION
> #cmakedefine01 ENABLE_CSS_VARIABLES
> #cmakedefine01 ENABLE_CSS3_FLEXBOX
>+#cmakedefine01 ENABLE_CSS3_TEXT_DECORATION
> #cmakedefine01 ENABLE_CSS_FILTERS
> #cmakedefine01 ENABLE_CSS_SHADERS
> #cmakedefine01 ENABLE_CUSTOM_SCHEME_HANDLER
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index 1503a4ab8c12aceac857adf2f6e9ae71bebb2021..4254ee009fa73dd1a3c6088d046e91d8f7ce81f0 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,30 @@
>+2012-08-14  Bruno de Oliveira Abinader  <bruno.abinader@basyskom.com>
>+
>+        [css3-text] Add CSS3 Text decoration compile flag
>+        https://bugs.webkit.org/show_bug.cgi?id=93863
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        A series of CSS3 text decoration properties implementations are currently on the
>+        works. These adds new properties which specifications are not finished yet, thus
>+        subject to changes. A new feature flag is required, with its boilerplate
>+        implementation handled in this bug and further bugs related to these
>+        implementations shall take advantage of this flag.
>+
>+        This patch handles the compile flag implementation, which will come disabled by
>+        default, thus not exposing the CSS3 text decoration features to the web, unless
>+        when explicitly enabling it with "--css3-text-decoration" build parameter.
>+
>+        Changeset r125205 added "-webkit-text-decoration-line" support without proper
>+        compile flag. I am fixing this on this patch by adding #ifdef's along the added
>+        code and reverting getComputedStyle* layout test changes until further notice.
>+        The text-decoration-line.html layout test is now moved to
>+        fast/css3-text-decoration directory, which is skipped on all platforms until
>+        feature is sound and ready to be exposed to web.
>+
>+        * Scripts/webkitperl/FeatureList.pm:
>+        * qmake/mkspecs/features/features.pri:
>+
> 2012-08-14  Alexey Proskuryakov  <ap@apple.com>
> 
>         [WK2] Fix some typos in MiniBrowser
>diff --git a/Tools/Scripts/webkitperl/FeatureList.pm b/Tools/Scripts/webkitperl/FeatureList.pm
>index 93094782824ff9a5211b2bf6406a61e420d9b161..796c503f7dd8cf94343c31a430d090b433a56688 100644
>--- a/Tools/Scripts/webkitperl/FeatureList.pm
>+++ b/Tools/Scripts/webkitperl/FeatureList.pm
>@@ -50,6 +50,7 @@ my (
>     $channelMessagingSupport,
>     $cspNextSupport,
>     $css3FlexboxSupport,
>+    $css3TextDecorationSupport,
>     $cssBoxDecorationBreakSupport,
>     $cssExclusionsSupport,
>     $cssFiltersSupport,
>@@ -169,6 +170,9 @@ my @features = (
>     { option => "css3-flexbox", desc => "Toggle CSS3 Flexbox support",
>       define => "ENABLE_CSS3_FLEXBOX", default => 1, value => \$css3FlexboxSupport },
> 
>+    { option => "css3-text-decoration", desc => "Toggle CSS3 Text Decoration support",
>+      define => "ENABLE_CSS3_TEXT_DECORATION", default => 0, value => \$css3TextDecorationSupport },
>+
>     { option => "css-hierarchies", desc => "Toggle CSS Hierarchy support",
>       define => "ENABLE_CSS_HIERARCHIES", default => 0, value => \$cssHierarchiesSupport },
> 
>diff --git a/Tools/qmake/mkspecs/features/features.pri b/Tools/qmake/mkspecs/features/features.pri
>index 97dd7ae4151ba85d70b248e0cae2a5d74d659475..99cc70b785d19d4516ae1c179a60a8dd01532484 100644
>--- a/Tools/qmake/mkspecs/features/features.pri
>+++ b/Tools/qmake/mkspecs/features/features.pri
>@@ -31,6 +31,7 @@ FEATURE_DEFAULTS = \
>     ENABLE_CSS_SHADERS=0 \
>     ENABLE_CSS_VARIABLES=0 \
>     ENABLE_CSS3_FLEXBOX=1 \
>+    ENABLE_CSS3_TEXT_DECORATION=0 \
>     ENABLE_DASHBOARD_SUPPORT=0 \
>     ENABLE_DATAGRID=0 \
>     ENABLE_DATALIST_ELEMENT=1 \
>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index 8ec70195e8ff8b526d9559cb0e305e4c76d5a0e5..68b7bc1f6ad20fd01e57e6cd056673f67b79d50a 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,40 @@
>+2012-08-14  Bruno de Oliveira Abinader  <bruno.abinader@basyskom.com>
>+
>+        [css3-text] Add CSS3 Text decoration compile flag
>+        https://bugs.webkit.org/show_bug.cgi?id=93863
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        A series of CSS3 text decoration properties implementations are currently on the
>+        works. These adds new properties which specifications are not finished yet, thus
>+        subject to changes. A new feature flag is required, with its boilerplate
>+        implementation handled in this bug and further bugs related to these
>+        implementations shall take advantage of this flag.
>+
>+        This patch handles the compile flag implementation, which will come disabled by
>+        default, thus not exposing the CSS3 text decoration features to the web, unless
>+        when explicitly enabling it with "--css3-text-decoration" build parameter.
>+
>+        Changeset r125205 added "-webkit-text-decoration-line" support without proper
>+        compile flag. I am fixing this on this patch by adding #ifdef's along the added
>+        code and reverting getComputedStyle* layout test changes until further notice.
>+        The text-decoration-line.html layout test is now moved to
>+        fast/css3-text-decoration directory, which is skipped on all platforms until
>+        feature is sound and ready to be exposed to web.
>+
>+        * fast/css/getComputedStyle/computed-style-expected.txt: Reverted changes from r125205.
>+        * fast/css/getComputedStyle/computed-style-without-renderer-expected.txt: Reverted changes from r125205.
>+        * fast/css/getComputedStyle/resources/property-names.js: Reverted changes from r125205.
>+        * fast/css3-text-decoration/text-decoration-line-expected.html: Renamed from LayoutTests/fast/css/text-decoration-line-expected.html.
>+        * fast/css3-text-decoration/text-decoration-line.html: Renamed from LayoutTests/fast/css/text-decoration-line.html.
>+        * platform/chromium/TestExpectations: Skipped fast/css3-text-decoration directory.
>+        * platform/efl/TestExpectations: Skipped fast/css3-text-decoration directory.
>+        * platform/gtk/TestExpectations: Skipped fast/css3-text-decoration directory.
>+        * platform/mac/TestExpectations: Skipped fast/css3-text-decoration directory.
>+        * platform/qt/TestExpectations: Skipped fast/css3-text-decoration directory.
>+        * platform/win/TestExpectations: Skipped fast/css3-text-decoration directory.
>+        * svg/css/getComputedStyle-basic-expected.txt: Reverted changes from r125205.
>+
> 2012-08-14  Yoshifumi Inoue  <yosin@chromium.org>
> 
>         [Forms] Make input type "time" to use multiple field time input UI
>diff --git a/LayoutTests/fast/css/getComputedStyle/computed-style-expected.txt b/LayoutTests/fast/css/getComputedStyle/computed-style-expected.txt
>index 0e8a3ec7b43605148c5f27837998dd7238f6a1f5..59e382905ab9fc8e4907adfde12ab9c25c553ee1 100644
>--- a/LayoutTests/fast/css/getComputedStyle/computed-style-expected.txt
>+++ b/LayoutTests/fast/css/getComputedStyle/computed-style-expected.txt
>@@ -85,7 +85,6 @@ table-layout: auto;
> tab-size: 8;
> text-align: start;
> text-decoration: none;
>--webkit-text-decoration-line: none;
> text-indent: 0px;
> text-rendering: auto;
> text-shadow: none;
>diff --git a/LayoutTests/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt b/LayoutTests/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt
>index 9e7e823a685ae962330cb82612a8c770bf06923e..fb13fc32aca2250ba349af376ef48f33b7c5a575 100644
>--- a/LayoutTests/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt
>+++ b/LayoutTests/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt
>@@ -84,7 +84,6 @@ table-layout: auto
> tab-size: 8
> text-align: start
> text-decoration: none
>--webkit-text-decoration-line: none
> text-indent: 0px
> text-rendering: auto
> text-shadow: none
>diff --git a/LayoutTests/fast/css/getComputedStyle/resources/property-names.js b/LayoutTests/fast/css/getComputedStyle/resources/property-names.js
>index 34382b5b1232a91e5bb6c618ba065bc0d1e8068f..5098bdc01249539a30d9fa3928ecc1b2cc548fb0 100644
>--- a/LayoutTests/fast/css/getComputedStyle/resources/property-names.js
>+++ b/LayoutTests/fast/css/getComputedStyle/resources/property-names.js
>@@ -232,7 +232,6 @@ var propertiesToTest = {
>     "text-align": true,
>     "text-anchor": true,
>     "text-decoration": true,
>-    "-webkit-text-decoration-line": true,
>     "text-indent": true,
>     "text-overflow": true,
>     "text-rendering": true,
>diff --git a/LayoutTests/fast/css/text-decoration-line-expected.html b/LayoutTests/fast/css/text-decoration-line-expected.html
>deleted file mode 100644
>index b65539e60cb7565bbe5b56be6306ac209828e918..0000000000000000000000000000000000000000
>--- a/LayoutTests/fast/css/text-decoration-line-expected.html
>+++ /dev/null
>@@ -1,29 +0,0 @@
>-<html>
>-<head>
>-    <style>
>-            .none { text-decoration: none; }
>-            .underline { text-decoration: underline; }
>-            .overline { text-decoration: overline; }
>-            .line-through { text-decoration: line-through; }
>-            .all-decorations { text-decoration: underline overline line-through; }
>-    </style>
>-</head>
>-<body>
>-    <div>Each line of this test should match its style description (<i>-webkit-text-decoration-line</i> resets <i>text-decoration</i>, except when the latter is set as <i>important</i>):</div><br/>
>-    <div class="underline">This text is underlined <span>(also inside span).</span></div><br/>
>-    <div class="overline">This text is overlined <span>(also inside span).</span></div><br/>
>-    <div class="line-through">This text has a line-through <span>(also inside span).</span></div><br/>
>-    <div class=none">This text contains no decorations.</div><br/>
>-    <div class="underline">This text is underlined.</div><br/>
>-    <div class=none">This text contains no decorations.</div><br/>
>-    <div class="overline">This text is overlined.</div><br/>
>-    <div class=none">This text contains no decorations.</div><br/>
>-    <div class="line-through">This text has a line-through.</div><br/>
>-    <div class=none">This text contains no decorations.</div><br/>
>-    <div class="all-decorations">This text is underlined, overlined and has a line-through.</div><br/>
>-    <div class=none">This text contains no decorations.</div><br/>
>-    <div class="overline">This text is overlined.</div><br/>
>-    <div class="overline">This text is overlined.</div><br/>
>-    <div class="underline">This text is underlined.</div>
>-</body>
>-</html>
>diff --git a/LayoutTests/fast/css/text-decoration-line.html b/LayoutTests/fast/css/text-decoration-line.html
>deleted file mode 100644
>index 4d44b1704d95ce7bbe52e490858bf7bfa53bc739..0000000000000000000000000000000000000000
>--- a/LayoutTests/fast/css/text-decoration-line.html
>+++ /dev/null
>@@ -1,29 +0,0 @@
>-<html>
>-<head>
>-    <style>
>-            .none { text-decoration: none; }
>-            .underline { text-decoration: underline; }
>-            .overline { text-decoration: overline; }
>-            .line-through { text-decoration: line-through; }
>-            .all-decorations { text-decoration: underline overline line-through; }
>-    </style>
>-</head>
>-<body>
>-    <div>Each line of this test should match its style description (<i>-webkit-text-decoration-line</i> resets <i>text-decoration</i>, except when the latter is set as <i>important</i>):</div><br/>
>-    <div style="-webkit-text-decoration-line: underline;">This text is underlined <span class="none">(also inside span).</span></div><br/>
>-    <div style="-webkit-text-decoration-line: overline;">This text is overlined <span class="none">(also inside span).</span></div><br/>
>-    <div style="-webkit-text-decoration-line: line-through;">This text has a line-through <span class="none">(also inside span).</span></div><br/>
>-    <div class="underline" style="-webkit-text-decoration-line: none;">This text contains no decorations.</div><br/>
>-    <div class="underline" style="-webkit-text-decoration-line: underline;">This text is underlined.</div><br/>
>-    <div class="overline" style="-webkit-text-decoration-line: none;">This text contains no decorations.</div><br/>
>-    <div class="overline" style="-webkit-text-decoration-line: overline;">This text is overlined.</div><br/>
>-    <div class="line-through" style="-webkit-text-decoration-line: none;">This text contains no decorations.</div><br/>
>-    <div class="line-through" style="-webkit-text-decoration-line: line-through;">This text has a line-through.</div><br/>
>-    <div class="all-decorations" style="-webkit-text-decoration-line: none;">This text contains no decorations.</div><br/>
>-    <div class="all-decorations" style="-webkit-text-decoration-line: underline overline line-through;">This text is underlined, overlined and has a line-through.</div><br/>
>-    <div style="-webkit-text-decoration-line: underline; text-decoration: none !important;">This text contains no decorations.</div><br/>
>-    <div style="-webkit-text-decoration-line: underline; text-decoration: overline !important;">This text is overlined.</div><br/>
>-    <div style="-webkit-text-decoration-line: underline !important; text-decoration: overline !important;">This text is overlined.</div><br/>
>-    <div style="text-decoration: overline !important; -webkit-text-decoration-line: underline !important;">This text is underlined.</div>
>-</body>
>-</html>
>diff --git a/LayoutTests/fast/css3-text-decoration/text-decoration-line-expected.html b/LayoutTests/fast/css3-text-decoration/text-decoration-line-expected.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..b65539e60cb7565bbe5b56be6306ac209828e918
>--- /dev/null
>+++ b/LayoutTests/fast/css3-text-decoration/text-decoration-line-expected.html
>@@ -0,0 +1,29 @@
>+<html>
>+<head>
>+    <style>
>+            .none { text-decoration: none; }
>+            .underline { text-decoration: underline; }
>+            .overline { text-decoration: overline; }
>+            .line-through { text-decoration: line-through; }
>+            .all-decorations { text-decoration: underline overline line-through; }
>+    </style>
>+</head>
>+<body>
>+    <div>Each line of this test should match its style description (<i>-webkit-text-decoration-line</i> resets <i>text-decoration</i>, except when the latter is set as <i>important</i>):</div><br/>
>+    <div class="underline">This text is underlined <span>(also inside span).</span></div><br/>
>+    <div class="overline">This text is overlined <span>(also inside span).</span></div><br/>
>+    <div class="line-through">This text has a line-through <span>(also inside span).</span></div><br/>
>+    <div class=none">This text contains no decorations.</div><br/>
>+    <div class="underline">This text is underlined.</div><br/>
>+    <div class=none">This text contains no decorations.</div><br/>
>+    <div class="overline">This text is overlined.</div><br/>
>+    <div class=none">This text contains no decorations.</div><br/>
>+    <div class="line-through">This text has a line-through.</div><br/>
>+    <div class=none">This text contains no decorations.</div><br/>
>+    <div class="all-decorations">This text is underlined, overlined and has a line-through.</div><br/>
>+    <div class=none">This text contains no decorations.</div><br/>
>+    <div class="overline">This text is overlined.</div><br/>
>+    <div class="overline">This text is overlined.</div><br/>
>+    <div class="underline">This text is underlined.</div>
>+</body>
>+</html>
>diff --git a/LayoutTests/fast/css3-text-decoration/text-decoration-line.html b/LayoutTests/fast/css3-text-decoration/text-decoration-line.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..4d44b1704d95ce7bbe52e490858bf7bfa53bc739
>--- /dev/null
>+++ b/LayoutTests/fast/css3-text-decoration/text-decoration-line.html
>@@ -0,0 +1,29 @@
>+<html>
>+<head>
>+    <style>
>+            .none { text-decoration: none; }
>+            .underline { text-decoration: underline; }
>+            .overline { text-decoration: overline; }
>+            .line-through { text-decoration: line-through; }
>+            .all-decorations { text-decoration: underline overline line-through; }
>+    </style>
>+</head>
>+<body>
>+    <div>Each line of this test should match its style description (<i>-webkit-text-decoration-line</i> resets <i>text-decoration</i>, except when the latter is set as <i>important</i>):</div><br/>
>+    <div style="-webkit-text-decoration-line: underline;">This text is underlined <span class="none">(also inside span).</span></div><br/>
>+    <div style="-webkit-text-decoration-line: overline;">This text is overlined <span class="none">(also inside span).</span></div><br/>
>+    <div style="-webkit-text-decoration-line: line-through;">This text has a line-through <span class="none">(also inside span).</span></div><br/>
>+    <div class="underline" style="-webkit-text-decoration-line: none;">This text contains no decorations.</div><br/>
>+    <div class="underline" style="-webkit-text-decoration-line: underline;">This text is underlined.</div><br/>
>+    <div class="overline" style="-webkit-text-decoration-line: none;">This text contains no decorations.</div><br/>
>+    <div class="overline" style="-webkit-text-decoration-line: overline;">This text is overlined.</div><br/>
>+    <div class="line-through" style="-webkit-text-decoration-line: none;">This text contains no decorations.</div><br/>
>+    <div class="line-through" style="-webkit-text-decoration-line: line-through;">This text has a line-through.</div><br/>
>+    <div class="all-decorations" style="-webkit-text-decoration-line: none;">This text contains no decorations.</div><br/>
>+    <div class="all-decorations" style="-webkit-text-decoration-line: underline overline line-through;">This text is underlined, overlined and has a line-through.</div><br/>
>+    <div style="-webkit-text-decoration-line: underline; text-decoration: none !important;">This text contains no decorations.</div><br/>
>+    <div style="-webkit-text-decoration-line: underline; text-decoration: overline !important;">This text is overlined.</div><br/>
>+    <div style="-webkit-text-decoration-line: underline !important; text-decoration: overline !important;">This text is overlined.</div><br/>
>+    <div style="text-decoration: overline !important; -webkit-text-decoration-line: underline !important;">This text is underlined.</div>
>+</body>
>+</html>
>diff --git a/LayoutTests/platform/chromium/TestExpectations b/LayoutTests/platform/chromium/TestExpectations
>index 555bc7162757a686e78520b486d43c87b417309a..11b2d6381089c8a2887b83224b7c4f3198e637b2 100644
>--- a/LayoutTests/platform/chromium/TestExpectations
>+++ b/LayoutTests/platform/chromium/TestExpectations
>@@ -152,6 +152,9 @@ BUGWK85262 SKIP : fast/css/image-resolution = PASS
> // CSS image-orientation is not yet enabled.
> BUGWK89052 SKIP : fast/css/image-orientation = PASS
> 
>+// CSS3 Text Decoration support is not yet enabled (needs ENABLE_CSS3_TEXT_DECORATION).
>+BUGWK58491 SKIP : fast/css3-text-decoration = PASS
>+
> // Chromium does not support smart pasting in text controls yet.
> BUGWK60830 SKIP : editing/pasteboard/smart-paste-in-text-control.html = PASS
> 
>diff --git a/LayoutTests/platform/efl/TestExpectations b/LayoutTests/platform/efl/TestExpectations
>index 0eb4b077e84bf604251720be3abadaf1455cfb0c..4a3bf4c5f4bbedf7dd3995cba55bd6b2f72247be 100644
>--- a/LayoutTests/platform/efl/TestExpectations
>+++ b/LayoutTests/platform/efl/TestExpectations
>@@ -57,6 +57,9 @@ BUGWK85262 SKIP : fast/css/image-resolution = PASS
> // CSS image-orientation is not yet enabled.
> BUGWK89052 SKIP : fast/css/image-orientation = PASS
> 
>+// CSS3 Text Decoration support is not yet enabled (needs ENABLE_CSS3_TEXT_DECORATION).
>+BUGWK58491 SKIP : fast/css3-text-decoration = PASS
>+
> // This test assumes we cannot play RTSP, but we can.
> BUGWKEFL SKIP : media/unsupported-rtsp.html = TIMEOUT
> 
>diff --git a/LayoutTests/platform/gtk/TestExpectations b/LayoutTests/platform/gtk/TestExpectations
>index ebac9468f17b47f6c936a8cb8cf60db5d2670a80..c265c84756fc60d5d871e799d9fe68b0e171dd2b 100644
>--- a/LayoutTests/platform/gtk/TestExpectations
>+++ b/LayoutTests/platform/gtk/TestExpectations
>@@ -362,6 +362,9 @@ BUGWK85262 SKIP : fast/css/image-resolution = PASS TEXT
> // CSS image-orientation is not yet enabled.
> BUGWK89052 SKIP : fast/css/image-orientation = PASS
> 
>+// CSS3 Text Decoration support is not yet enabled (needs ENABLE_CSS3_TEXT_DECORATION).
>+BUGWK58491 SKIP : fast/css3-text-decoration = PASS
>+
> // No CORS support for media elements is implemented yet.
> BUGWKGTK SKIP : http/tests/security/video-cross-origin-readback.html = TEXT
> 
>diff --git a/LayoutTests/platform/mac/TestExpectations b/LayoutTests/platform/mac/TestExpectations
>index 29f7001a9cc01bbdc4fa6d1e53510605f516c76c..7e0a0035cbeaef0db8811b2dd24fbc313ffddc22 100644
>--- a/LayoutTests/platform/mac/TestExpectations
>+++ b/LayoutTests/platform/mac/TestExpectations
>@@ -22,6 +22,9 @@ BUGWK85262 SKIP : fast/css/image-resolution = PASS
> // CSS image-orientation is not yet enabled.
> BUGWK89052 SKIP : fast/css/image-orientation = PASS
> 
>+// CSS3 Text Decoration support is not yet enabled (needs ENABLE_CSS3_TEXT_DECORATION).
>+BUGWK58491 SKIP : fast/css3-text-decoration = PASS
>+
> // Our slow tests, in alphabetical order.
> BUGWK57672 : http/tests/local/fileapi/send-sliced-dragged-file.html = TEXT PASS
> 
>diff --git a/LayoutTests/platform/qt/TestExpectations b/LayoutTests/platform/qt/TestExpectations
>index c9c4415108a1d168e6fdcf18c89d018456843589..0aa19f7b5d9e5ad60d7f56f1f2f8a02719b06c3d 100644
>--- a/LayoutTests/platform/qt/TestExpectations
>+++ b/LayoutTests/platform/qt/TestExpectations
>@@ -118,6 +118,9 @@ BUGWK85262 SKIP : fast/css/image-resolution = PASS
> // CSS image-orientation is not yet enabled.
> BUGWK89052 SKIP : fast/css/image-orientation = PASS
> 
>+// CSS3 Text Decoration support is not yet enabled (needs ENABLE_CSS3_TEXT_DECORATION).
>+BUGWK58491 SKIP : fast/css3-text-decoration = PASS
>+
> // Needs rebaseline after bug 86441
> // failing new tests
> BUGWK86441 SKIP : fast/borders/border-antialiasing.html = IMAGE
>diff --git a/LayoutTests/platform/win/TestExpectations b/LayoutTests/platform/win/TestExpectations
>index d6184c0087dd0b1dc6253d3fa3c0c1aef52c3d73..f955b15c57fad77783a8653e45fd981bb84a9732 100644
>--- a/LayoutTests/platform/win/TestExpectations
>+++ b/LayoutTests/platform/win/TestExpectations
>@@ -6,3 +6,6 @@ BUGWK85565 : fast/block/float/016.html = IMAGE
> BUGWK85565 : fast/css/border-solid-single-edge-antialias.html = IMAGE
> 
> BUGWK90007 : http/tests/security/mixedContent/insecure-audio-video-in-main-frame.html = TEXT
>+
>+// CSS3 Text Decoration support is not yet enabled (needs ENABLE_CSS3_TEXT_DECORATION).
>+BUGWK58491 SKIP : fast/css3-text-decoration = PASS
>diff --git a/LayoutTests/svg/css/getComputedStyle-basic-expected.txt b/LayoutTests/svg/css/getComputedStyle-basic-expected.txt
>index 12c73c6abf164d8616c1719ebb29e5bf0bdc6b3b..2e1900a21b26e9c8cea81a3e05472d0b9f21210f 100644
>--- a/LayoutTests/svg/css/getComputedStyle-basic-expected.txt
>+++ b/LayoutTests/svg/css/getComputedStyle-basic-expected.txt
>@@ -168,8 +168,6 @@ rect: style.getPropertyValue(text-align) : start
> rect: style.getPropertyCSSValue(text-align) : [object CSSPrimitiveValue]
> rect: style.getPropertyValue(text-decoration) : none
> rect: style.getPropertyCSSValue(text-decoration) : [object CSSPrimitiveValue]
>-rect: style.getPropertyValue(-webkit-text-decoration-line) : none
>-rect: style.getPropertyCSSValue(-webkit-text-decoration-line) : [object CSSPrimitiveValue]
> rect: style.getPropertyValue(text-indent) : 0px
> rect: style.getPropertyCSSValue(text-indent) : [object CSSPrimitiveValue]
> rect: style.getPropertyValue(text-rendering) : auto
>@@ -672,8 +670,6 @@ g: style.getPropertyValue(text-align) : start
> g: style.getPropertyCSSValue(text-align) : [object CSSPrimitiveValue]
> g: style.getPropertyValue(text-decoration) : none
> g: style.getPropertyCSSValue(text-decoration) : [object CSSPrimitiveValue]
>-g: style.getPropertyValue(-webkit-text-decoration-line) : none
>-g: style.getPropertyCSSValue(-webkit-text-decoration-line) : [object CSSPrimitiveValue]
> g: style.getPropertyValue(text-indent) : 0px
> g: style.getPropertyCSSValue(text-indent) : [object CSSPrimitiveValue]
> g: style.getPropertyValue(text-rendering) : auto
>diff --git a/ChangeLog b/ChangeLog
>index a28c6a82142efead3553bbd928a4cd91710873d5..ad4b8eed5e260730f1fc3008dfd28f722e0c78f3 100644
>--- a/ChangeLog
>+++ b/ChangeLog
>@@ -1,3 +1,31 @@
>+2012-08-14  Bruno de Oliveira Abinader  <bruno.abinader@basyskom.com>
>+
>+        [css3-text] Add CSS3 Text decoration compile flag
>+        https://bugs.webkit.org/show_bug.cgi?id=93863
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        A series of CSS3 text decoration properties implementations are currently on the
>+        works. These adds new properties which specifications are not finished yet, thus
>+        subject to changes. A new feature flag is required, with its boilerplate
>+        implementation handled in this bug and further bugs related to these
>+        implementations shall take advantage of this flag.
>+
>+        This patch handles the compile flag implementation, which will come disabled by
>+        default, thus not exposing the CSS3 text decoration features to the web, unless
>+        when explicitly enabling it with "--css3-text-decoration" build parameter.
>+
>+        Changeset r125205 added "-webkit-text-decoration-line" support without proper
>+        compile flag. I am fixing this on this patch by adding #ifdef's along the added
>+        code and reverting getComputedStyle* layout test changes until further notice.
>+        The text-decoration-line.html layout test is now moved to
>+        fast/css3-text-decoration directory, which is skipped on all platforms until
>+        feature is sound and ready to be exposed to web.
>+
>+        * Source/cmake/WebKitFeatures.cmake:
>+        * Source/cmakeconfig.h.cmake:
>+        * configure.ac:
>+
> 2012-08-14  Milian Wolff  <milian.wolff@kdab.com>
> 
>         [Qt] QtWebKit linking fails for QNX cross build
>diff --git a/WebKitLibraries/ChangeLog b/WebKitLibraries/ChangeLog
>index 5b3bc8911d999ce075c1b8326c77be7960c0995a..cd0ccb1e563ff8c4845c0b70fc538e9e6e894a30 100644
>--- a/WebKitLibraries/ChangeLog
>+++ b/WebKitLibraries/ChangeLog
>@@ -1,3 +1,30 @@
>+2012-08-14  Bruno de Oliveira Abinader  <bruno.abinader@basyskom.com>
>+
>+        [css3-text] Add CSS3 Text decoration compile flag
>+        https://bugs.webkit.org/show_bug.cgi?id=93863
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        A series of CSS3 text decoration properties implementations are currently on the
>+        works. These adds new properties which specifications are not finished yet, thus
>+        subject to changes. A new feature flag is required, with its boilerplate
>+        implementation handled in this bug and further bugs related to these
>+        implementations shall take advantage of this flag.
>+
>+        This patch handles the compile flag implementation, which will come disabled by
>+        default, thus not exposing the CSS3 text decoration features to the web, unless
>+        when explicitly enabling it with "--css3-text-decoration" build parameter.
>+
>+        Changeset r125205 added "-webkit-text-decoration-line" support without proper
>+        compile flag. I am fixing this on this patch by adding #ifdef's along the added
>+        code and reverting getComputedStyle* layout test changes until further notice.
>+        The text-decoration-line.html layout test is now moved to
>+        fast/css3-text-decoration directory, which is skipped on all platforms until
>+        feature is sound and ready to be exposed to web.
>+
>+        * win/tools/vsprops/FeatureDefines.vsprops:
>+        * win/tools/vsprops/FeatureDefinesCairo.vsprops:
>+
> 2012-08-14  Alex Christensen  <alex.christensen@flexsim.com>
> 
>         /SAFESEH should not be a common linker option
>diff --git a/WebKitLibraries/win/tools/vsprops/FeatureDefines.vsprops b/WebKitLibraries/win/tools/vsprops/FeatureDefines.vsprops
>index 973447e20d820aec15db5d4b5acc07ef0d33f8fe..9cd78c361fca05e4dceefd0aa5c4b9eebd316028 100644
>--- a/WebKitLibraries/win/tools/vsprops/FeatureDefines.vsprops
>+++ b/WebKitLibraries/win/tools/vsprops/FeatureDefines.vsprops
>@@ -9,7 +9,7 @@
> 	>
>   <Tool
> 		Name="VCCLCompilerTool"
>-		PreprocessorDefinitions="$(ENABLE_IFRAME_SEAMLESS);$(ENABLE_REQUEST_ANIMATION_FRAME);$(ENABLE_3D_RENDERING);$(ENABLE_ACCELERATED_2D_CANVAS);$(ENABLE_BLOB);$(ENABLE_CHANNEL_MESSAGING);$(ENABLE_CSS3_FLEXBOX);$(ENABLE_CSS_BOX_DECORATION_BREAK);$(ENABLE_CSS_FILTERS);$(ENABLE_CSS_GRID_LAYOUT);$(ENABLE_CSS_SHADERS);$(ENABLE_CSS_COMPOSITING);$(ENABLE_CSS_REGIONS);$(ENABLE_CSS_EXCLUSIONS);$(ENABLE_CSS_STICKY_POSITION);$(ENABLE_CUSTOM_SCHEME_HANDLER);$(ENABLE_SQL_DATABASE);$(ENABLE_DATAGRID);$(ENABLE_DATALIST_ELEMENT);$(ENABLE_DATA_TRANSFER_ITEMS);$(ENABLE_DETAILS_ELEMENT);$(ENABLE_DEVICE_ORIENTATION);$(ENABLE_DIRECTORY_UPLOAD);$(ENABLE_FILTERS);$(ENABLE_FILE_SYSTEM);$(ENABLE_FULLSCREEN_API);$(ENABLE_GAMEPAD);$(ENABLE_GEOLOCATION);$(ENABLE_HIGH_DPI_CANVAS);$(ENABLE_ICONDATABASE);$(ENABLE_INDEXED_DATABASE);$(ENABLE_INPUT_TYPE_COLOR);$(ENABLE_INPUT_SPEECH);$(ENABLE_INPUT_TYPE_DATE);$(ENABLE_INPUT_TYPE_DATETIME);$(ENABLE_INPUT_TYPE_DATETIMELOCAL);$(ENABLE_INPUT_TYPE_MONTH);$(ENABLE_INPUT_TYPE_TIME);$(ENABLE_INPUT_TYPE_WEEK);$(ENABLE_JAVASCRIPT_DEBUGGER);$(ENABLE_LEGACY_CSS_VENDOR_PREFIXES);$(ENABLE_LEGACY_NOTIFICATIONS);$(ENABLE_LINK_PREFETCH);$(ENABLE_LINK_PRERENDER);$(ENABLE_MATHML);$(ENABLE_METER_ELEMENT);$(ENABLE_MICRODATA);$(ENABLE_MUTATION_OBSERVERS);$(ENABLE_NOTIFICATIONS);$(ENABLE_PAGE_VISIBILITY_API);$(ENABLE_PROGRESS_ELEMENT);$(ENABLE_QUOTA);$(ENABLE_REGISTER_PROTOCOL_HANDLER);$(ENABLE_SCRIPTED_SPEECH);$(ENABLE_SHADOW_DOM);$(ENABLE_SHARED_WORKERS);$(ENABLE_STYLE_SCOPED);$(ENABLE_SVG);$(ENABLE_SVG_DOM_OBJC_BINDINGS);$(ENABLE_SVG_FONTS);$(ENABLE_TEXT_AUTOSIZING);$(ENABLE_UNDO_MANAGER);$(ENABLE_VIDEO);$(ENABLE_MEDIA_SOURCE);$(ENABLE_MEDIA_STATISTICS);$(ENABLE_WEB_SOCKETS);$(ENABLE_WEB_TIMING);$(ENABLE_WORKERS);$(ENABLE_XSLT)"
>+		PreprocessorDefinitions="$(ENABLE_IFRAME_SEAMLESS);$(ENABLE_REQUEST_ANIMATION_FRAME);$(ENABLE_3D_RENDERING);$(ENABLE_ACCELERATED_2D_CANVAS);$(ENABLE_BLOB);$(ENABLE_CHANNEL_MESSAGING);$(ENABLE_CSS3_FLEXBOX);$(ENABLE_CSS3_TEXT_DECORATION);$(ENABLE_CSS_BOX_DECORATION_BREAK);$(ENABLE_CSS_FILTERS);$(ENABLE_CSS_GRID_LAYOUT);$(ENABLE_CSS_SHADERS);$(ENABLE_CSS_COMPOSITING);$(ENABLE_CSS_REGIONS);$(ENABLE_CSS_EXCLUSIONS);$(ENABLE_CSS_STICKY_POSITION);$(ENABLE_CUSTOM_SCHEME_HANDLER);$(ENABLE_SQL_DATABASE);$(ENABLE_DATAGRID);$(ENABLE_DATALIST_ELEMENT);$(ENABLE_DATA_TRANSFER_ITEMS);$(ENABLE_DETAILS_ELEMENT);$(ENABLE_DEVICE_ORIENTATION);$(ENABLE_DIRECTORY_UPLOAD);$(ENABLE_FILTERS);$(ENABLE_FILE_SYSTEM);$(ENABLE_FULLSCREEN_API);$(ENABLE_GAMEPAD);$(ENABLE_GEOLOCATION);$(ENABLE_HIGH_DPI_CANVAS);$(ENABLE_ICONDATABASE);$(ENABLE_INDEXED_DATABASE);$(ENABLE_INPUT_TYPE_COLOR);$(ENABLE_INPUT_SPEECH);$(ENABLE_INPUT_TYPE_DATE);$(ENABLE_INPUT_TYPE_DATETIME);$(ENABLE_INPUT_TYPE_DATETIMELOCAL);$(ENABLE_INPUT_TYPE_MONTH);$(ENABLE_INPUT_TYPE_TIME);$(ENABLE_INPUT_TYPE_WEEK);$(ENABLE_JAVASCRIPT_DEBUGGER);$(ENABLE_LEGACY_CSS_VENDOR_PREFIXES);$(ENABLE_LEGACY_NOTIFICATIONS);$(ENABLE_LINK_PREFETCH);$(ENABLE_LINK_PRERENDER);$(ENABLE_MATHML);$(ENABLE_METER_ELEMENT);$(ENABLE_MICRODATA);$(ENABLE_MUTATION_OBSERVERS);$(ENABLE_NOTIFICATIONS);$(ENABLE_PAGE_VISIBILITY_API);$(ENABLE_PROGRESS_ELEMENT);$(ENABLE_QUOTA);$(ENABLE_REGISTER_PROTOCOL_HANDLER);$(ENABLE_SCRIPTED_SPEECH);$(ENABLE_SHADOW_DOM);$(ENABLE_SHARED_WORKERS);$(ENABLE_STYLE_SCOPED);$(ENABLE_SVG);$(ENABLE_SVG_DOM_OBJC_BINDINGS);$(ENABLE_SVG_FONTS);$(ENABLE_TEXT_AUTOSIZING);$(ENABLE_UNDO_MANAGER);$(ENABLE_VIDEO);$(ENABLE_MEDIA_SOURCE);$(ENABLE_MEDIA_STATISTICS);$(ENABLE_WEB_SOCKETS);$(ENABLE_WEB_TIMING);$(ENABLE_WORKERS);$(ENABLE_XSLT)"
> 	/>
>   <UserMacro
> 		Name="ENABLE_3D_RENDERING"
>@@ -42,6 +42,11 @@
> 		PerformEnvironmentSet="true"
> 	/>
>   <UserMacro
>+		Name="ENABLE_CSS3_TEXT_DECORATION"
>+		Value=""
>+		PerformEnvironmentSet="true"
>+	/>
>+  <UserMacro
> 		Name="ENABLE_CSS_BOX_DECORATION_BREAK"
> 		Value="ENABLE_CSS_BOX_DECORATION_BREAK"
> 		PerformEnvironmentSet="true"
>diff --git a/WebKitLibraries/win/tools/vsprops/FeatureDefinesCairo.vsprops b/WebKitLibraries/win/tools/vsprops/FeatureDefinesCairo.vsprops
>index 9d0b77f1af0f405467e84456ef4b7638c545bac1..ce4df3d461a4e9f310026b2c2d505599c7366cef 100644
>--- a/WebKitLibraries/win/tools/vsprops/FeatureDefinesCairo.vsprops
>+++ b/WebKitLibraries/win/tools/vsprops/FeatureDefinesCairo.vsprops
>@@ -9,7 +9,7 @@
> 	>
>   <Tool
> 		Name="VCCLCompilerTool"
>-		PreprocessorDefinitions="$(ENABLE_IFRAME_SEAMLESS);$(ENABLE_REQUEST_ANIMATION_FRAME);$(ENABLE_3D_RENDERING);$(ENABLE_ACCELERATED_2D_CANVAS);$(ENABLE_BLOB);$(ENABLE_CHANNEL_MESSAGING);$(ENABLE_CSS3_FLEXBOX);$(ENABLE_CSS_BOX_DECORATION_BREAK);$(ENABLE_CSS_FILTERS);$(ENABLE_CSS_GRID_LAYOUT);$(ENABLE_CSS_SHADERS);$(ENABLE_CSS_COMPOSITING);$(ENABLE_CSS_REGIONS);$(ENABLE_CSS_EXCLUSIONS);$(ENABLE_CUSTOM_SCHEME_HANDLER);$(ENABLE_SQL_DATABASE);$(ENABLE_DATAGRID);$(ENABLE_DATALIST_ELEMENT);$(ENABLE_DATA_TRANSFER_ITEMS);$(ENABLE_DETAILS_ELEMENT);$(ENABLE_DEVICE_ORIENTATION);$(ENABLE_DIRECTORY_UPLOAD);$(ENABLE_FILTERS);$(ENABLE_FILE_SYSTEM);$(ENABLE_FULLSCREEN_API);$(ENABLE_GAMEPAD);$(ENABLE_GEOLOCATION);$(ENABLE_HIGH_DPI_CANVAS);$(ENABLE_ICONDATABASE);$(ENABLE_INDEXED_DATABASE);$(ENABLE_INPUT_TYPE_COLOR);$(ENABLE_INPUT_SPEECH);$(ENABLE_INPUT_TYPE_DATE);$(ENABLE_INPUT_TYPE_DATETIME);$(ENABLE_INPUT_TYPE_DATETIMELOCAL);$(ENABLE_INPUT_TYPE_MONTH);$(ENABLE_INPUT_TYPE_TIME);$(ENABLE_INPUT_TYPE_WEEK);$(ENABLE_JAVASCRIPT_DEBUGGER);$(ENABLE_LEGACY_CSS_VENDOR_PREFIXES);$(ENABLE_LEGACY_NOTIFICATIONS);$(ENABLE_LINK_PREFETCH);$(ENABLE_LINK_PRERENDER);$(ENABLE_MATHML);$(ENABLE_METER_ELEMENT);$(ENABLE_MICRODATA);$(ENABLE_MUTATION_OBSERVERS);$(ENABLE_NOTIFICATIONS);$(ENABLE_PAGE_VISIBILITY_API);$(ENABLE_PROGRESS_ELEMENT);$(ENABLE_QUOTA);$(ENABLE_REGISTER_PROTOCOL_HANDLER);$(ENABLE_SCRIPTED_SPEECH);$(ENABLE_SHADOW_DOM);$(ENABLE_SHARED_WORKERS);$(ENABLE_STYLE_SCOPED);$(ENABLE_SVG);$(ENABLE_SVG_DOM_OBJC_BINDINGS);$(ENABLE_SVG_FONTS);$(ENABLE_TEXT_AUTOSIZING);$(ENABLE_UNDO_MANAGER);$(ENABLE_VIDEO);$(ENABLE_MEDIA_SOURCE);$(ENABLE_MEDIA_STATISTICS);$(ENABLE_WEB_SOCKETS);$(ENABLE_WEB_TIMING);$(ENABLE_WORKERS);$(ENABLE_XSLT)"
>+		PreprocessorDefinitions="$(ENABLE_IFRAME_SEAMLESS);$(ENABLE_REQUEST_ANIMATION_FRAME);$(ENABLE_3D_RENDERING);$(ENABLE_ACCELERATED_2D_CANVAS);$(ENABLE_BLOB);$(ENABLE_CHANNEL_MESSAGING);$(ENABLE_CSS3*_FLEXBOX);$(ENABLE_CSS3_TEXT_DECORATION);$(ENABLE_CSS_BOX_DECORATION_BREAK);$(ENABLE_CSS_FILTERS);$(ENABLE_CSS_GRID_LAYOUT);$(ENABLE_CSS_SHADERS);$(ENABLE_CSS_COMPOSITING);$(ENABLE_CSS_REGIONS);$(ENABLE_CSS_EXCLUSIONS);$(ENABLE_CUSTOM_SCHEME_HANDLER);$(ENABLE_SQL_DATABASE);$(ENABLE_DATAGRID);$(ENABLE_DATALIST_ELEMENT);$(ENABLE_DATA_TRANSFER_ITEMS);$(ENABLE_DETAILS_ELEMENT);$(ENABLE_DEVICE_ORIENTATION);$(ENABLE_DIRECTORY_UPLOAD);$(ENABLE_FILTERS);$(ENABLE_FILE_SYSTEM);$(ENABLE_FULLSCREEN_API);$(ENABLE_GAMEPAD);$(ENABLE_GEOLOCATION);$(ENABLE_HIGH_DPI_CANVAS);$(ENABLE_ICONDATABASE);$(ENABLE_INDEXED_DATABASE);$(ENABLE_INPUT_TYPE_COLOR);$(ENABLE_INPUT_SPEECH);$(ENABLE_INPUT_TYPE_DATE);$(ENABLE_INPUT_TYPE_DATETIME);$(ENABLE_INPUT_TYPE_DATETIMELOCAL);$(ENABLE_INPUT_TYPE_MONTH);$(ENABLE_INPUT_TYPE_TIME);$(ENABLE_INPUT_TYPE_WEEK);$(ENABLE_JAVASCRIPT_DEBUGGER);$(ENABLE_LEGACY_CSS_VENDOR_PREFIXES);$(ENABLE_LEGACY_NOTIFICATIONS);$(ENABLE_LINK_PREFETCH);$(ENABLE_LINK_PRERENDER);$(ENABLE_MATHML);$(ENABLE_METER_ELEMENT);$(ENABLE_MICRODATA);$(ENABLE_MUTATION_OBSERVERS);$(ENABLE_NOTIFICATIONS);$(ENABLE_PAGE_VISIBILITY_API);$(ENABLE_PROGRESS_ELEMENT);$(ENABLE_QUOTA);$(ENABLE_REGISTER_PROTOCOL_HANDLER);$(ENABLE_SCRIPTED_SPEECH);$(ENABLE_SHADOW_DOM);$(ENABLE_SHARED_WORKERS);$(ENABLE_STYLE_SCOPED);$(ENABLE_SVG);$(ENABLE_SVG_DOM_OBJC_BINDINGS);$(ENABLE_SVG_FONTS);$(ENABLE_TEXT_AUTOSIZING);$(ENABLE_UNDO_MANAGER);$(ENABLE_VIDEO);$(ENABLE_MEDIA_SOURCE);$(ENABLE_MEDIA_STATISTICS);$(ENABLE_WEB_SOCKETS);$(ENABLE_WEB_TIMING);$(ENABLE_WORKERS);$(ENABLE_XSLT)"
> 	/>
>   <UserMacro
> 		Name="ENABLE_3D_RENDERING"
>@@ -42,6 +42,11 @@
> 		PerformEnvironmentSet="true"
> 	/>
>   <UserMacro
>+		Name="ENABLE_CSS3_TEXT_DECORATION"
>+		Value=""
>+		PerformEnvironmentSet="true"
>+	/>
>+  <UserMacro
> 		Name="ENABLE_CSS_BOX_DECORATION_BREAK"
> 		Value="ENABLE_CSS_BOX_DECORATION_BREAK"
> 		PerformEnvironmentSet="true"
>diff --git a/configure.ac b/configure.ac
>index ac31e59796f891ed5c1720d30aedf26938385f60..78f2067e6eb7ffdcfaeab7b07a8cbb167d6ff4ee 100644
>--- a/configure.ac
>+++ b/configure.ac
>@@ -1006,6 +1006,14 @@ AC_ARG_ENABLE(css3_flexbox,
>               [],[enable_css3_flexbox=$enable_unstable_features])
> AC_MSG_RESULT([$enable_css3_flexbox])
> 
>+# check whether to enable CSS3 text decoration support
>+AC_MSG_CHECKING([whether to enable CSS3 text decoration support])
>+AC_ARG_ENABLE(css3_text_decoration,
>+              AC_HELP_STRING([--enable-css3-text-decoration],
>+                             [enable CSS3 text decoration support [default=no]]),
>+              [],[enable_css3_text_decoration=$enable_unstable_features])
>+AC_MSG_RESULT([$enable_css3_text_decoration])
>+
> # check whether to enable FastMalloc
> AC_MSG_CHECKING([whether to enable optimized memory allocator])
> AC_ARG_ENABLE(fast_malloc,
>@@ -1464,6 +1472,7 @@ 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_CSS3_FLEXBOX],[test "$enable_css3_flexbox" = "yes"])
>+AM_CONDITIONAL([ENABLE_CSS3_TEXT_DECORATION],[test "$enable_css3_text_decoration" = "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"])
>@@ -1550,6 +1559,7 @@ Features:
>  CSS Regions support                                      : $enable_css_regions
>  CSS box-decoration-break support                         : $enable_css_box_decoration_break
>  CSS3 Flexbox support                                     : $enable_css3_flexbox
>+ CSS3 Text Decoration support                             : $enable_css3_text_decoration
>  Color input support                                      : $enable_input_type_color
>  DOM mutation observer support                            : $enable_mutation_observers
>  DeviceOrientation support                                : $enable_device_orientation

Actions: View | Formatted Diff | Diff

Attachments on bug 93863: 158181 | 158187 | 158192 | 158336 | 158451 | 158474 | 158479 | 158627