Skip to content

W
webkit
Commit 607bf6e3 authored by mmaxfield@apple.com's avatar mmaxfield@apple.com
Browse files
Options

Remove CSS3_TEXT_DECORATION define 

https://bugs.webkit.org/show_bug.cgi?id=127333

Source/JavaScriptCore:

This is required for unprefixing the text-decoration-* CSS properties.

Reviewed by Simon Fraser.

* Configurations/FeatureDefines.xcconfig:

Source/WebCore:

Reviewed by Simon Fraser.

This is required for unprefixing the text-decoration-* CSS properties.

No new tests are necessary becase the flag was already on by default.

* Configurations/FeatureDefines.xcconfig:
* css/CSSComputedStyleDeclaration.cpp:
(WebCore::renderTextDecorationSkipFlagsToCSSValue):
(WebCore::ComputedStyleExtractor::propertyValue):
* css/CSSParser.cpp:
(WebCore::isColorPropertyID):
(WebCore::CSSParser::parseValue):
(WebCore::CSSParser::addTextDecorationProperty):
(WebCore::CSSParser::parseTextUnderlinePosition):
* css/CSSParser.h:
* css/CSSPrimitiveValueMappings.h:
(WebCore::CSSPrimitiveValue::operator TextUnderlinePosition):
* css/CSSPropertyNames.in:
* css/CSSValueKeywords.in:
* css/DeprecatedStyleBuilder.cpp:
(WebCore::DeprecatedStyleBuilder::DeprecatedStyleBuilder):
* css/StylePropertyShorthand.cpp:
(WebCore::webkitTextDecorationShorthand):
(WebCore::shorthandForProperty):
(WebCore::matchingShorthandsForLonghand):
* css/StylePropertyShorthand.h:
* css/StyleResolver.cpp:
(WebCore::shouldApplyPropertyInParseOrder):
(WebCore::isValidVisitedLinkProperty):
(WebCore::StyleResolver::applyProperty):
* platform/graphics/GraphicsContext.h:
* platform/graphics/cairo/GraphicsContextCairo.cpp:
(WebCore::GraphicsContext::setPlatformStrokeStyle):
* platform/graphics/cg/GraphicsContextCG.cpp:
(WebCore::GraphicsContext::platformInit):
* platform/graphics/wince/GraphicsContextWinCE.cpp:
(WebCore::createPen):
* rendering/InlineFlowBox.cpp:
(WebCore::InlineFlowBox::computeMaxLogicalTop):
* rendering/InlineFlowBox.h:
* rendering/InlineTextBox.cpp:
(WebCore::textDecorationStyleToStrokeStyle):
(WebCore::boundingBoxForAllActiveDecorations):
(WebCore::InlineTextBox::paintDecoration):
* rendering/RenderObject.cpp:
(WebCore::decorationColor):
* rendering/RootInlineBox.cpp:
(WebCore::RootInlineBox::maxLogicalTop):
* rendering/RootInlineBox.h:
* rendering/style/RenderStyle.cpp:
(WebCore::RenderStyle::changeRequiresRepaintIfTextOrBorderOrOutline):
(WebCore::RenderStyle::colorIncludingFallback):
(WebCore::RenderStyle::visitedDependentColor):
* rendering/style/RenderStyle.h:
* rendering/style/RenderStyleConstants.h:
* rendering/style/StyleRareInheritedData.cpp:
(WebCore::StyleRareInheritedData::StyleRareInheritedData):
(WebCore::StyleRareInheritedData::operator==):
* rendering/style/StyleRareInheritedData.h:
* rendering/style/StyleRareNonInheritedData.cpp:
(WebCore::StyleRareNonInheritedData::StyleRareNonInheritedData):
(WebCore::StyleRareNonInheritedData::operator==):
* rendering/style/StyleRareNonInheritedData.h:

Source/WebKit/mac:

Reviewed by Simon Fraser.

This is required for unprefixing the text-decoration-* CSS properties.

* Configurations/FeatureDefines.xcconfig:

Source/WebKit2:

Reviewed by Simon Fraser.

This is required for unprefixing the text-decoration-* CSS properties.

* Configurations/FeatureDefines.xcconfig:

Source/WTF:

Reviewed by Simon Fraser.

This is required for unprefixing the text-decoration-* CSS properties.

* wtf/Platform.h:

Tools:

This is required for unprefixing the text-decoration-* CSS properties.

Reviewed by Simon Fraser.

* Configurations/FeatureDefines.xcconfig:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@162579 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent a6ea9385
Hide whitespace changes
Inline Side-by-side
Showing with 134 additions and 156 deletions
Source/JavaScriptCore/ChangeLog
View file @ 607bf6e3
2014-01-22 Myles C. Maxfield <mmaxfield@apple.com>
Remove CSS3_TEXT_DECORATION define
https://bugs.webkit.org/show_bug.cgi?id=127333
This is required for unprefixing the text-decoration-* CSS properties.
Reviewed by Simon Fraser.
* Configurations/FeatureDefines.xcconfig:
2014-01-22 Alexey Proskuryakov <ap@apple.com>
Update JS whitespace definition for changes in Unicode 6.3
......
Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig
View file @ 607bf6e3
......@@ -56,7 +56,6 @@ ENABLE_CSS_STICKY_POSITION = ENABLE_CSS_STICKY_POSITION;
ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED = ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED;
ENABLE_CSS3_CONDITIONAL_RULES = ;
ENABLE_CSS3_TEXT = ;
ENABLE_CSS3_TEXT_DECORATION = ENABLE_CSS3_TEXT_DECORATION;
ENABLE_CSS3_TEXT_LINE_BREAK = ;
ENABLE_CURSOR_VISIBILITY = ENABLE_CURSOR_VISIBILITY;
ENABLE_CUSTOM_SCHEME_HANDLER = ;
......@@ -198,4 +197,4 @@ ENABLE_XSLT = ENABLE_XSLT;
ENABLE_FTL_JIT = ;
ENABLE_LLINT_C_LOOP = ;
FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_BLOB) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_EXCLUSIONS) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SHADERS) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS_STICKY_POSITION) $(ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED) $(ENABLE_CSS3_CONDITIONAL_RULES) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS3_TEXT_DECORATION) $(ENABLE_CSS3_TEXT_LINE_BREAK) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_DRAGGABLE_REGION) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FILTERS) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_HIGH_DPI_CANVAS) $(ENABLE_ICONDATABASE) $(ENABLE_IFRAME_SEAMLESS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_IOS_AIRPLAY) $(ENABLE_IOS_TEXT_AUTOSIZING) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_PLUGIN_PROXY_FOR_VIDEO) $(ENABLE_PROGRESS_ELEMENT) $(ENABLE_PROMISES) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_SCRIPTED_SPEECH) $(ENABLE_SHADOW_DOM) $(ENABLE_SHARED_WORKERS) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SQL_DATABASE) $(ENABLE_SUBPIXEL_LAYOUT) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG) $(ENABLE_SVG_FONTS) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBGL) $(ENABLE_WEB_ANIMATIONS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(ENABLE_LLINT_C_LOOP) $(FEATURE_DEFINES_$(PLATFORM_NAME));
FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_BLOB) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_EXCLUSIONS) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SHADERS) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS_STICKY_POSITION) $(ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED) $(ENABLE_CSS3_CONDITIONAL_RULES) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS3_TEXT_LINE_BREAK) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_DRAGGABLE_REGION) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FILTERS) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_HIGH_DPI_CANVAS) $(ENABLE_ICONDATABASE) $(ENABLE_IFRAME_SEAMLESS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_IOS_AIRPLAY) $(ENABLE_IOS_TEXT_AUTOSIZING) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_PLUGIN_PROXY_FOR_VIDEO) $(ENABLE_PROGRESS_ELEMENT) $(ENABLE_PROMISES) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_SCRIPTED_SPEECH) $(ENABLE_SHADOW_DOM) $(ENABLE_SHARED_WORKERS) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SQL_DATABASE) $(ENABLE_SUBPIXEL_LAYOUT) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG) $(ENABLE_SVG_FONTS) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBGL) $(ENABLE_WEB_ANIMATIONS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(ENABLE_LLINT_C_LOOP) $(FEATURE_DEFINES_$(PLATFORM_NAME));
Source/WTF/ChangeLog
View file @ 607bf6e3
2014-01-22 Myles C. Maxfield <mmaxfield@apple.com>
Remove CSS3_TEXT_DECORATION define
https://bugs.webkit.org/show_bug.cgi?id=127333
Reviewed by Simon Fraser.
This is required for unprefixing the text-decoration-* CSS properties.
* wtf/Platform.h:
2014-01-22 Jae Hyun Park <jae.park@company100.net>
Remove unnecessary include in Noncopyable.h
......
Source/WTF/wtf/Platform.h
View file @ 607bf6e3
......@@ -1044,7 +1044,7 @@
#define ENABLE_OPENTYPE_VERTICAL 1
#endif
#if ENABLE(CSS3_TEXT_DECORATION) && PLATFORM(MAC)
#if PLATFORM(MAC)
#define ENABLE_CSS3_TEXT_DECORATION_SKIP_INK 1
#endif
......
Source/WebCore/ChangeLog
View file @ 607bf6e3
2014-01-22 Myles C. Maxfield <mmaxfield@apple.com>
Remove CSS3_TEXT_DECORATION define
https://bugs.webkit.org/show_bug.cgi?id=127333
Reviewed by Simon Fraser.
This is required for unprefixing the text-decoration-* CSS properties.
No new tests are necessary becase the flag was already on by default.
* Configurations/FeatureDefines.xcconfig:
* css/CSSComputedStyleDeclaration.cpp:
(WebCore::renderTextDecorationSkipFlagsToCSSValue):
(WebCore::ComputedStyleExtractor::propertyValue):
* css/CSSParser.cpp:
(WebCore::isColorPropertyID):
(WebCore::CSSParser::parseValue):
(WebCore::CSSParser::addTextDecorationProperty):
(WebCore::CSSParser::parseTextUnderlinePosition):
* css/CSSParser.h:
* css/CSSPrimitiveValueMappings.h:
(WebCore::CSSPrimitiveValue::operator TextUnderlinePosition):
* css/CSSPropertyNames.in:
* css/CSSValueKeywords.in:
* css/DeprecatedStyleBuilder.cpp:
(WebCore::DeprecatedStyleBuilder::DeprecatedStyleBuilder):
* css/StylePropertyShorthand.cpp:
(WebCore::webkitTextDecorationShorthand):
(WebCore::shorthandForProperty):
(WebCore::matchingShorthandsForLonghand):
* css/StylePropertyShorthand.h:
* css/StyleResolver.cpp:
(WebCore::shouldApplyPropertyInParseOrder):
(WebCore::isValidVisitedLinkProperty):
(WebCore::StyleResolver::applyProperty):
* platform/graphics/GraphicsContext.h:
* platform/graphics/cairo/GraphicsContextCairo.cpp:
(WebCore::GraphicsContext::setPlatformStrokeStyle):
* platform/graphics/cg/GraphicsContextCG.cpp:
(WebCore::GraphicsContext::platformInit):
* platform/graphics/wince/GraphicsContextWinCE.cpp:
(WebCore::createPen):
* rendering/InlineFlowBox.cpp:
(WebCore::InlineFlowBox::computeMaxLogicalTop):
* rendering/InlineFlowBox.h:
* rendering/InlineTextBox.cpp:
(WebCore::textDecorationStyleToStrokeStyle):
(WebCore::boundingBoxForAllActiveDecorations):
(WebCore::InlineTextBox::paintDecoration):
* rendering/RenderObject.cpp:
(WebCore::decorationColor):
* rendering/RootInlineBox.cpp:
(WebCore::RootInlineBox::maxLogicalTop):
* rendering/RootInlineBox.h:
* rendering/style/RenderStyle.cpp:
(WebCore::RenderStyle::changeRequiresRepaintIfTextOrBorderOrOutline):
(WebCore::RenderStyle::colorIncludingFallback):
(WebCore::RenderStyle::visitedDependentColor):
* rendering/style/RenderStyle.h:
* rendering/style/RenderStyleConstants.h:
* rendering/style/StyleRareInheritedData.cpp:
(WebCore::StyleRareInheritedData::StyleRareInheritedData):
(WebCore::StyleRareInheritedData::operator==):
* rendering/style/StyleRareInheritedData.h:
* rendering/style/StyleRareNonInheritedData.cpp:
(WebCore::StyleRareNonInheritedData::StyleRareNonInheritedData):
(WebCore::StyleRareNonInheritedData::operator==):
* rendering/style/StyleRareNonInheritedData.h:
2014-01-22 Chris Fleizach <cfleizach@apple.com>
AX: Do not return an accessible name for an object just because it has tabindex=0
Source/WebCore/Configurations/FeatureDefines.xcconfig
View file @ 607bf6e3
......@@ -56,7 +56,6 @@ ENABLE_CSS_STICKY_POSITION = ENABLE_CSS_STICKY_POSITION;
ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED = ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED;
ENABLE_CSS3_CONDITIONAL_RULES = ;
ENABLE_CSS3_TEXT = ;
ENABLE_CSS3_TEXT_DECORATION = ENABLE_CSS3_TEXT_DECORATION;
ENABLE_CSS3_TEXT_LINE_BREAK = ;
ENABLE_CURSOR_VISIBILITY = ENABLE_CURSOR_VISIBILITY;
ENABLE_CUSTOM_SCHEME_HANDLER = ;
......@@ -198,4 +197,4 @@ ENABLE_XSLT = ENABLE_XSLT;
ENABLE_FTL_JIT = ;
ENABLE_LLINT_C_LOOP = ;
FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_BLOB) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_EXCLUSIONS) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SHADERS) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS_STICKY_POSITION) $(ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED) $(ENABLE_CSS3_CONDITIONAL_RULES) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS3_TEXT_DECORATION) $(ENABLE_CSS3_TEXT_LINE_BREAK) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_DRAGGABLE_REGION) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FILTERS) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_HIGH_DPI_CANVAS) $(ENABLE_ICONDATABASE) $(ENABLE_IFRAME_SEAMLESS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_IOS_AIRPLAY) $(ENABLE_IOS_TEXT_AUTOSIZING) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_PLUGIN_PROXY_FOR_VIDEO) $(ENABLE_PROGRESS_ELEMENT) $(ENABLE_PROMISES) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_SCRIPTED_SPEECH) $(ENABLE_SHADOW_DOM) $(ENABLE_SHARED_WORKERS) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SQL_DATABASE) $(ENABLE_SUBPIXEL_LAYOUT) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG) $(ENABLE_SVG_FONTS) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBGL) $(ENABLE_WEB_ANIMATIONS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(ENABLE_LLINT_C_LOOP) $(FEATURE_DEFINES_$(PLATFORM_NAME));
FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_BLOB) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_EXCLUSIONS) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SHADERS) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS_STICKY_POSITION) $(ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED) $(ENABLE_CSS3_CONDITIONAL_RULES) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS3_TEXT_LINE_BREAK) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_DRAGGABLE_REGION) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FILTERS) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_HIGH_DPI_CANVAS) $(ENABLE_ICONDATABASE) $(ENABLE_IFRAME_SEAMLESS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_IOS_AIRPLAY) $(ENABLE_IOS_TEXT_AUTOSIZING) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_PLUGIN_PROXY_FOR_VIDEO) $(ENABLE_PROGRESS_ELEMENT) $(ENABLE_PROMISES) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_SCRIPTED_SPEECH) $(ENABLE_SHADOW_DOM) $(ENABLE_SHARED_WORKERS) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SQL_DATABASE) $(ENABLE_SUBPIXEL_LAYOUT) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG) $(ENABLE_SVG_FONTS) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBGL) $(ENABLE_WEB_ANIMATIONS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(ENABLE_LLINT_C_LOOP) $(FEATURE_DEFINES_$(PLATFORM_NAME));
Source/WebCore/css/CSSComputedStyleDeclaration.cpp
View file @ 607bf6e3
......@@ -195,13 +195,11 @@ static const CSSPropertyID computedProperties[] = {
CSSPropertyWebkitTextAlignLast,
CSSPropertyWebkitTextJustify,
#endif // CSS3_TEXT
#if ENABLE(CSS3_TEXT_DECORATION)
CSSPropertyWebkitTextDecorationLine,
CSSPropertyWebkitTextDecorationStyle,
CSSPropertyWebkitTextDecorationColor,
CSSPropertyWebkitTextDecorationSkip,
CSSPropertyWebkitTextUnderlinePosition,
#endif // CSS3_TEXT_DECORATION
CSSPropertyTextIndent,
CSSPropertyTextRendering,
CSSPropertyTextShadow,
......@@ -1429,7 +1427,6 @@ static PassRef<CSSValue> renderTextDecorationFlagsToCSSValue(int textDecoration)
return list.releaseNonNull();
}
#if ENABLE(CSS3_TEXT_DECORATION)
static PassRef<CSSValue> renderTextDecorationStyleFlagsToCSSValue(TextDecorationStyle textDecorationStyle)
{
switch (textDecorationStyle) {
......@@ -1461,7 +1458,6 @@ static PassRef<CSSValue> renderTextDecorationSkipFlagsToCSSValue(TextDecorationS
ASSERT_NOT_REACHED();
return cssValuePool().createExplicitInitialValue();
}
#endif // CSS3_TEXT_DECORATION
static PassRef<CSSValue> renderEmphasisPositionFlagsToCSSValue(TextEmphasisPosition textEmphasisPosition)
{
......@@ -2422,7 +2418,6 @@ PassRefPtr<CSSValue> ComputedStyleExtractor::propertyValue(CSSPropertyID propert
case CSSPropertyWebkitTextJustify:
return cssValuePool().createValue(style->textJustify());
#endif // CSS3_TEXT
#if ENABLE(CSS3_TEXT_DECORATION)
case CSSPropertyWebkitTextDecoration:
return getCSSPropertyValuesForShorthandProperties(webkitTextDecorationShorthand());
case CSSPropertyWebkitTextDecorationLine:
......@@ -2435,7 +2430,6 @@ PassRefPtr<CSSValue> ComputedStyleExtractor::propertyValue(CSSPropertyID propert
return renderTextDecorationSkipFlagsToCSSValue(style->textDecorationSkip());
case CSSPropertyWebkitTextUnderlinePosition:
return cssValuePool().createValue(style->textUnderlinePosition());
#endif
case CSSPropertyWebkitTextDecorationsInEffect:
return renderTextDecorationFlagsToCSSValue(style->textDecorationsInEffect());
case CSSPropertyWebkitTextFillColor:
......
Source/WebCore/css/CSSParser.cpp
View file @ 607bf6e3
......@@ -504,9 +504,7 @@ static inline bool isColorPropertyID(CSSPropertyID propertyId)
case CSSPropertyWebkitBorderEndColor:
case CSSPropertyWebkitBorderStartColor:
case CSSPropertyWebkitColumnRuleColor:
#if ENABLE(CSS3_TEXT_DECORATION)
case CSSPropertyWebkitTextDecorationColor:
#endif
case CSSPropertyWebkitTextEmphasisColor:
case CSSPropertyWebkitTextFillColor:
case CSSPropertyWebkitTextStrokeColor:
......@@ -1939,9 +1937,7 @@ bool CSSParser::parseValue(CSSPropertyID propId, bool important)
case CSSPropertyTextUnderlineColor:
case CSSPropertyTextOverlineColor:
case CSSPropertyWebkitColumnRuleColor:
#if ENABLE(CSS3_TEXT_DECORATION)
case CSSPropertyWebkitTextDecorationColor:
#endif
case CSSPropertyWebkitTextEmphasisColor:
case CSSPropertyWebkitTextFillColor:
case CSSPropertyWebkitTextStrokeColor:
......@@ -2260,21 +2256,16 @@ bool CSSParser::parseValue(CSSPropertyID propId, bool important)
break;
}
#if ENABLE(CSS3_TEXT_DECORATION)
case CSSPropertyWebkitTextDecoration:
// [ <text-decoration-line> || <text-decoration-style> || <text-decoration-color> ] | inherit
return parseShorthand(CSSPropertyWebkitTextDecoration, webkitTextDecorationShorthand(), important);
#endif
case CSSPropertyTextDecoration:
case CSSPropertyWebkitTextDecorationsInEffect:
#if ENABLE(CSS3_TEXT_DECORATION)
case CSSPropertyWebkitTextDecorationLine:
#endif
// none | [ underline || overline || line-through || blink ] | inherit
return parseTextDecoration(propId, important);
#if ENABLE(CSS3_TEXT_DECORATION)
case CSSPropertyWebkitTextDecorationStyle:
// solid | double | dotted | dashed | wavy
if (id == CSSValueSolid || id == CSSValueDouble || id == CSSValueDotted || id == CSSValueDashed || id == CSSValueWavy)
......@@ -2288,7 +2279,6 @@ bool CSSParser::parseValue(CSSPropertyID propId, bool important)
case CSSPropertyWebkitTextUnderlinePosition:
// auto | alphabetic | under
return parseTextUnderlinePosition(important);
#endif
case CSSPropertyZoom: // normal | reset | document | <number> | <percentage> | inherit
if (id == CSSValueNormal || id == CSSValueReset || id == CSSValueDocument)
......@@ -10023,7 +10013,6 @@ 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 && !inShorthand()) {
for (unsigned i = 0; i < m_parsedProperties.size(); ++i) {
......@@ -10031,7 +10020,6 @@ void CSSParser::addTextDecorationProperty(CSSPropertyID propId, PassRefPtr<CSSVa
return;
}
}
#endif // CSS3_TEXT_DECORATION
addProperty(propId, value, important);
}
......@@ -10074,7 +10062,6 @@ bool CSSParser::parseTextDecoration(CSSPropertyID propId, bool important)
return false;
}
#if ENABLE(CSS3_TEXT_DECORATION)
bool CSSParser::parseTextDecorationSkip(bool important)
{
// The text-decoration-skip property has syntax "none | [ objects || spaces || ink || edges || box-decoration ]".
......@@ -10113,7 +10100,6 @@ bool CSSParser::parseTextUnderlinePosition(bool important)
}
return false;
}
#endif // CSS3_TEXT_DECORATION
bool CSSParser::parseTextEmphasisStyle(bool important)
{
......
Source/WebCore/css/CSSParser.h
View file @ 607bf6e3
......@@ -293,10 +293,8 @@ public:
void addTextDecorationProperty(CSSPropertyID, PassRefPtr<CSSValue>, bool important);
bool parseTextDecoration(CSSPropertyID propId, bool important);
#if ENABLE(CSS3_TEXT_DECORATION)
bool parseTextDecorationSkip(bool important);
bool parseTextUnderlinePosition(bool important);
#endif
PassRefPtr<CSSValue> parseTextIndent();
......
Source/WebCore/css/CSSPrimitiveValueMappings.h
View file @ 607bf6e3
......@@ -2635,7 +2635,6 @@ template<> inline CSSPrimitiveValue::operator TextDecoration() const
return TextDecorationNone;
}
#if ENABLE(CSS3_TEXT_DECORATION)
template<> inline CSSPrimitiveValue::operator TextDecorationStyle() const
{
ASSERT(isValueID());
......@@ -2698,7 +2697,6 @@ template<> inline CSSPrimitiveValue::operator TextUnderlinePosition() const
ASSERT_NOT_REACHED();
return TextUnderlinePositionAuto;
}
#endif // CSS3_TEXT_DECORATION
template<> inline CSSPrimitiveValue::CSSPrimitiveValue(ETextSecurity e)
: CSSValue(PrimitiveClass)
......
Source/WebCore/css/CSSPropertyNames.in
View file @ 607bf6e3
......@@ -391,14 +391,12 @@ z-index
-webkit-text-align-last [Inherited]
-webkit-text-justify [Inherited]
#endif
#if defined(ENABLE_CSS3_TEXT_DECORATION) && ENABLE_CSS3_TEXT_DECORATION
-webkit-text-decoration
-webkit-text-decoration-line
-webkit-text-decoration-style
-webkit-text-decoration-color
-webkit-text-decoration-skip [Inherited]
-webkit-text-underline-position [Inherited]
#endif
-webkit-text-decorations-in-effect [Inherited]
-webkit-text-emphasis [Inherited]
-epub-text-emphasis = -webkit-text-emphasis
......
Source/WebCore/css/CSSValueKeywords.in
View file @ 607bf6e3
......@@ -484,10 +484,8 @@ static
thick
thin
underline
#if defined(ENABLE_CSS3_TEXT_DECORATION) && ENABLE_CSS3_TEXT_DECORATION
wavy
ink
#endif
-webkit-nowrap
// CSS3 Values
......
Source/WebCore/css/DeprecatedStyleBuilder.cpp
View file @ 607bf6e3
......@@ -1282,7 +1282,6 @@ public:
}
};
#if ENABLE(CSS3_TEXT_DECORATION)
static TextDecorationSkip valueToDecorationSkip(CSSPrimitiveValue& primitiveValue)
{
ASSERT(primitiveValue.isValueID());
......@@ -1320,7 +1319,6 @@ public:
return PropertyHandler(handler.inheritFunction(), handler.initialFunction(), &applyValue);
}
};
#endif // CSS3_TEXT_DECORATION
class ApplyPropertyMarqueeIncrement {
public:
......@@ -1411,7 +1409,6 @@ public:
}
};
#if ENABLE(CSS3_TEXT_DECORATION)
class ApplyPropertyTextUnderlinePosition {
public:
static void applyValue(CSSPropertyID, StyleResolver* styleResolver, CSSValue* value)
......@@ -1438,7 +1435,6 @@ public:
return PropertyHandler(handler.inheritFunction(), handler.initialFunction(), &applyValue);
}
};
#endif // CSS3_TEXT_DECORATION
class ApplyPropertyLineHeight {
public:
......@@ -2450,13 +2446,11 @@ DeprecatedStyleBuilder::DeprecatedStyleBuilder()
setPropertyHandler(CSSPropertyWebkitTextAlignLast, ApplyPropertyDefault<TextAlignLast, &RenderStyle::textAlignLast, TextAlignLast, &RenderStyle::setTextAlignLast, TextAlignLast, &RenderStyle::initialTextAlignLast>::createHandler());
setPropertyHandler(CSSPropertyWebkitTextJustify, ApplyPropertyDefault<TextJustify, &RenderStyle::textJustify, TextJustify, &RenderStyle::setTextJustify, TextJustify, &RenderStyle::initialTextJustify>::createHandler());
#endif // CSS3_TEXT
#if ENABLE(CSS3_TEXT_DECORATION)
setPropertyHandler(CSSPropertyWebkitTextDecorationLine, ApplyPropertyTextDecoration::createHandler());
setPropertyHandler(CSSPropertyWebkitTextDecorationStyle, ApplyPropertyDefault<TextDecorationStyle, &RenderStyle::textDecorationStyle, TextDecorationStyle, &RenderStyle::setTextDecorationStyle, TextDecorationStyle, &RenderStyle::initialTextDecorationStyle>::createHandler());
setPropertyHandler(CSSPropertyWebkitTextDecorationColor, ApplyPropertyColor<NoInheritFromParent, &RenderStyle::textDecorationColor, &RenderStyle::setTextDecorationColor, &RenderStyle::setVisitedLinkTextDecorationColor, &RenderStyle::color>::createHandler());
setPropertyHandler(CSSPropertyWebkitTextDecorationSkip, ApplyPropertyTextDecorationSkip::createHandler());
setPropertyHandler(CSSPropertyWebkitTextUnderlinePosition, ApplyPropertyTextUnderlinePosition::createHandler());
#endif
setPropertyHandler(CSSPropertyTextIndent, ApplyPropertyTextIndent::createHandler());
setPropertyHandler(CSSPropertyTextOverflow, ApplyPropertyDefault<TextOverflow, &RenderStyle::textOverflow, TextOverflow, &RenderStyle::setTextOverflow, TextOverflow, &RenderStyle::initialTextOverflow>::createHandler());
setPropertyHandler(CSSPropertyTextRendering, ApplyPropertyFont<TextRenderingMode, &FontDescription::textRenderingMode, &FontDescription::setTextRenderingMode, AutoTextRendering>::createHandler());
......
Source/WebCore/css/StylePropertyShorthand.cpp
View file @ 607bf6e3
......@@ -424,7 +424,6 @@ StylePropertyShorthand webkitMaskRepeatShorthand()
return StylePropertyShorthand(CSSPropertyWebkitMaskRepeat, maskRepeatProperties, WTF_ARRAY_LENGTH(maskRepeatProperties));
}
#if ENABLE(CSS3_TEXT_DECORATION)
StylePropertyShorthand webkitTextDecorationShorthand()
{
static const CSSPropertyID textDecorationProperties[] = {
......@@ -434,7 +433,6 @@ StylePropertyShorthand webkitTextDecorationShorthand()
};
return StylePropertyShorthand(CSSPropertyWebkitTextDecoration, textDecorationProperties, WTF_ARRAY_LENGTH(textDecorationProperties));
}
#endif
StylePropertyShorthand webkitTextEmphasisShorthand()
{
......@@ -580,10 +578,8 @@ StylePropertyShorthand shorthandForProperty(CSSPropertyID propertyID)
return webkitTransitionShorthand();
case CSSPropertyWebkitTransformOrigin:
return webkitTransformOriginShorthand();
#if ENABLE(CSS3_TEXT_DECORATION)
case CSSPropertyWebkitTextDecoration:
return webkitTextDecorationShorthand();
#endif
#if ENABLE(SVG)
case CSSPropertyMarker:
return markerShorthand();
......@@ -802,12 +798,10 @@ Vector<StylePropertyShorthand> matchingShorthandsForLonghand(CSSPropertyID prope
case CSSPropertyMinHeight:
case CSSPropertyMaxHeight:
return makeVector(heightShorthand());
#if ENABLE(CSS3_TEXT_DECORATION)
case CSSPropertyWebkitTextDecorationLine:
case CSSPropertyWebkitTextDecorationStyle:
case CSSPropertyWebkitTextDecorationColor:
return makeVector(webkitTextDecorationShorthand());
#endif
#if ENABLE(SVG)
case CSSPropertyMarkerStart:
case CSSPropertyMarkerMid:
......
Source/WebCore/css/StylePropertyShorthand.h
View file @ 607bf6e3
......@@ -113,9 +113,7 @@ StylePropertyShorthand webkitTransitionShorthand();
StylePropertyShorthand webkitTransformOriginShorthand();
StylePropertyShorthand widthShorthand();
#if ENABLE(CSS3_TEXT_DECORATION)
StylePropertyShorthand webkitTextDecorationShorthand();
#endif
#if ENABLE(SVG)
StylePropertyShorthand markerShorthand();
......
Source/WebCore/css/StyleResolver.cpp
View file @ 607bf6e3
......@@ -1581,14 +1581,12 @@ static bool shouldApplyPropertyInParseOrder(CSSPropertyID propertyID)
case CSSPropertyBorderImageOutset:
case CSSPropertyBorderImageRepeat:
case CSSPropertyBorderImageWidth:
#if ENABLE(CSS3_TEXT_DECORATION)
case CSSPropertyWebkitTextDecoration:
case CSSPropertyWebkitTextDecorationLine:
case CSSPropertyWebkitTextDecorationStyle:
case CSSPropertyWebkitTextDecorationColor:
case CSSPropertyWebkitTextDecorationSkip:
case CSSPropertyWebkitTextUnderlinePosition:
#endif
case CSSPropertyTextDecoration:
return true;
default:
......@@ -1858,9 +1856,7 @@ inline bool isValidVisitedLinkProperty(CSSPropertyID id)
case CSSPropertyColor:
case CSSPropertyOutlineColor:
case CSSPropertyWebkitColumnRuleColor:
#if ENABLE(CSS3_TEXT_DECORATION)
case CSSPropertyWebkitTextDecorationColor:
#endif
case CSSPropertyWebkitTextEmphasisColor:
case CSSPropertyWebkitTextFillColor:
case CSSPropertyWebkitTextStrokeColor:
......@@ -3071,13 +3067,11 @@ void StyleResolver::applyProperty(CSSPropertyID id, CSSValue* value)
case CSSPropertyWebkitTextAlignLast:
case CSSPropertyWebkitTextJustify:
#endif // CSS3_TEXT
#if ENABLE(CSS3_TEXT_DECORATION)
case CSSPropertyWebkitTextDecorationLine:
case CSSPropertyWebkitTextDecorationStyle:
case CSSPropertyWebkitTextDecorationColor:
case CSSPropertyWebkitTextDecorationSkip:
case CSSPropertyWebkitTextUnderlinePosition:
#endif
case CSSPropertyWebkitTextEmphasisColor:
case CSSPropertyWebkitTextEmphasisPosition:
case CSSPropertyWebkitTextEmphasisStyle:
......
Source/WebCore/platform/graphics/GraphicsContext.h
View file @ 607bf6e3
......@@ -102,10 +102,8 @@ namespace WebCore {
SolidStroke,
DottedStroke,
DashedStroke,
#if ENABLE(CSS3_TEXT_DECORATION)
DoubleStroke,
WavyStroke,
#endif // CSS3_TEXT_DECORATION
};
enum InterpolationQuality {
......
Source/WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp
View file @ 607bf6e3
......@@ -758,10 +758,8 @@ void GraphicsContext::setPlatformStrokeStyle(StrokeStyle strokeStyle)
cairo_set_line_width(platformContext()->cr(), 0);
break;
case SolidStroke:
#if ENABLE(CSS3_TEXT_DECORATION)
case DoubleStroke:
case WavyStroke: // FIXME: https://bugs.webkit.org/show_bug.cgi?id=94110 - Needs platform support.
#endif // CSS3_TEXT_DECORATION
cairo_set_dash(platformContext()->cr(), 0, 0, 0);
break;
case DottedStroke:
......
Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp
View file @ 607bf6e3
......@@ -355,10 +355,8 @@ void GraphicsContext::drawLine(const IntPoint& point1, const IntPoint& point2)
switch (strokeStyle()) {
case NoStroke:
case SolidStroke:
#if ENABLE(CSS3_TEXT_DECORATION)
case DoubleStroke:
case WavyStroke: // FIXME: https://bugs.webkit.org/show_bug.cgi?id=94112 - Needs platform support.
#endif // CSS3_TEXT_DECORATION
break;
case DottedStroke:
patWidth = (int)width;
......
Source/WebCore/platform/graphics/wince/GraphicsContextWinCE.cpp
View file @ 607bf6e3
......@@ -354,10 +354,8 @@ static GDIObject<HPEN> createPen(const Color& col, double fWidth, StrokeStyle st
int penStyle = PS_NULL;
switch (style) {
case SolidStroke:
#if ENABLE(CSS3_TEXT_DECORATION)
case DoubleStroke:
case WavyStroke: // FIXME: https://bugs.webkit.org/show_bug.cgi?id=94114 - Needs platform support.
#endif // CSS3_TEXT_DECORATION
penStyle = PS_SOLID;
break;
case DottedStroke: // not supported on Windows CE
......
Source/WebCore/rendering/InlineFlowBox.cpp
View file @ 607bf6e3
......@@ -741,7 +741,6 @@ void InlineFlowBox::placeBoxesInBlockDirection(LayoutUnit top, LayoutUnit maxHei
}
}
#if ENABLE(CSS3_TEXT_DECORATION)
void InlineFlowBox::computeMaxLogicalTop(float& maxLogicalTop) const
{
for (InlineBox* curr = firstChild(); curr; curr = curr->nextOnLine()) {
......@@ -758,7 +757,6 @@ void InlineFlowBox::computeMaxLogicalTop(float& maxLogicalTop) const
maxLogicalTop = std::max<float>(maxLogicalTop, localMaxLogicalTop);
}
}
#endif // CSS3_TEXT_DECORATION
void InlineFlowBox::flipLinesInBlockDirection(LayoutUnit lineTop, LayoutUnit lineBottom)
{
......
Source/WebCore/rendering/InlineFlowBox.h
View file @ 607bf6e3
......@@ -313,11 +313,9 @@ protected:
InlineFlowBox* m_prevLineBox; // The previous box that also uses our RenderObject
InlineFlowBox* m_nextLineBox; // The next box that also uses our RenderObject
#if ENABLE(CSS3_TEXT_DECORATION)
// Maximum logicalTop among all children of an InlineFlowBox. Used to
// calculate the offset for TextUnderlinePositionUnder.
void computeMaxLogicalTop(float& maxLogicalTop) const;
#endif
private:
unsigned m_includeLogicalLeftEdge : 1;
unsigned m_includeLogicalRightEdge : 1;
......
Source/WebCore/rendering/InlineTextBox.cpp
View file @ 607bf6e3
......@@ -838,7 +838,6 @@ static StrokeStyle textDecorationStyleToStrokeStyle(TextDecorationStyle decorati
case TextDecorationStyleSolid:
strokeStyle = SolidStroke;
break;
#if ENABLE(CSS3_TEXT_DECORATION)
case TextDecorationStyleDouble:
strokeStyle = DoubleStroke;
break;
......@@ -851,13 +850,11 @@ static StrokeStyle textDecorationStyleToStrokeStyle(TextDecorationStyle decorati
case TextDecorationStyleWavy:
strokeStyle = WavyStroke;
break;
#endif // CSS3_TEXT_DECORATION
}
return strokeStyle;
}
#if ENABLE(CSS3_TEXT_DECORATION)
static int computeUnderlineOffset(const TextUnderlinePosition underlinePosition, const FontMetrics& fontMetrics, const InlineTextBox* inlineTextBox, const int textDecorationThickness)
{
// Compute the gap between the font and the underline. Use at least one
......@@ -1059,13 +1056,9 @@ static FloatRect boundingBoxForAllActiveDecorations(InlineTextBox& inlineTextBox
boundingBox.unite(boundingBoxForSingleDecoration(context, textDecorationThickness, width, localOrigin, decorationStyle, isPrinting, 2 * baseline / 3, 2 * baseline / 3, doubleOffset + 2 * baseline / 3));
return boundingBox;
}
#endif // CSS3_TEXT_DECORATION
void InlineTextBox::paintDecoration(GraphicsContext& context, const FloatPoint& boxOrigin, TextDecoration decoration, TextDecorationStyle decorationStyle, const ShadowData* shadow, TextPainter& textPainter)
{
#if !ENABLE(CSS3_TEXT_DECORATION)
UNUSED_PARAM(textPainter);
#endif
// FIXME: We should improve this rule and not always just assume 1.
const float textDecorationThickness = 1.f;
......@@ -1150,7 +1143,6 @@ void InlineTextBox::paintDecoration(GraphicsContext& context, const FloatPoint&
shadow = shadow->next();
}
#if ENABLE(CSS3_TEXT_DECORATION)
// Offset between lines - always non-zero, so lines never cross each other.
float doubleOffset = textDecorationThickness + 1;
......@@ -1181,11 +1173,9 @@ void InlineTextBox::paintDecoration(GraphicsContext& context, const FloatPoint&
context.clipToImageBuffer(imageBuffer.get(), enclosingDeviceRect);
}
}
#endif // CSS3_TEXT_DECORATION
context.setStrokeStyle(textDecorationStyleToStrokeStyle(decorationStyle));
if (decoration & TextDecorationUnderline) {
context.setStrokeColor(underline, colorSpace);
#if ENABLE(CSS3_TEXT_DECORATION)
TextUnderlinePosition underlinePosition = lineStyle.textUnderlinePosition();
const int underlineOffset = computeUnderlineOffset(underlinePosition, lineStyle.fontMetrics(), this, textDecorationThickness);
......@@ -1215,14 +1205,9 @@ void InlineTextBox::paintDecoration(GraphicsContext& context, const FloatPoint&
}
#endif
}
#else
// Leave one pixel of white between the baseline and the underline.
context.drawLineForText(FloatPoint(localOrigin.x(), localOrigin.y() + baseline + 1), width, isPrinting);
#endif // CSS3_TEXT_DECORATION
}
if (decoration & TextDecorationOverline) {
context.setStrokeColor(overline, colorSpace);
#if ENABLE(CSS3_TEXT_DECORATION)
switch (decorationStyle) {
case TextDecorationStyleWavy: {
FloatPoint start(localOrigin.x(), localOrigin.y() - doubleOffset);
......@@ -1241,24 +1226,18 @@ void InlineTextBox::paintDecoration(GraphicsContext& context, const FloatPoint&
}
} else {
#endif // CSS3_TEXT_DECORATION_SKIP_INK
#endif // CSS3_TEXT_DECORATION
context.drawLineForText(localOrigin, width, isPrinting);
#if ENABLE(CSS3_TEXT_DECORATION)
if (decorationStyle == TextDecorationStyleDouble)
context.drawLineForText(FloatPoint(localOrigin.x(), localOrigin.y() - doubleOffset), width, isPrinting);
#if ENABLE(CSS3_TEXT_DECORATION_SKIP_INK)
}
#endif
}
#endif // CSS3_TEXT_DECORATION
}
#if ENABLE(CSS3_TEXT_DECORATION)
if (clipDecorationToMask)
stateSaver.restore();
#endif
if (decoration & TextDecorationLineThrough) {
context.setStrokeColor(linethrough, colorSpace);
#if ENABLE(CSS3_TEXT_DECORATION)
switch (decorationStyle) {
case TextDecorationStyleWavy: {
FloatPoint start(localOrigin.x(), localOrigin.y() + 2 * baseline / 3);
......@@ -1267,13 +1246,10 @@ void InlineTextBox::paintDecoration(GraphicsContext& context, const FloatPoint&
break;
}
default:
#endif // CSS3_TEXT_DECORATION
context.drawLineForText(FloatPoint(localOrigin.x(), localOrigin.y() + 2 * baseline / 3), width, isPrinting);
#if ENABLE(CSS3_TEXT_DECORATION)
if (decorationStyle == TextDecorationStyleDouble)
context.drawLineForText(FloatPoint(localOrigin.x(), localOrigin.y() + doubleOffset + 2 * baseline / 3), width, isPrinting);
}
#endif // CSS3_TEXT_DECORATION
}
} while (shadow);
......
Source/WebCore/rendering/RenderObject.cpp
View file @ 607bf6e3
......@@ -2080,12 +2080,10 @@ PassRefPtr<RenderStyle> RenderObject::getUncachedPseudoStyle(const PseudoStyleRe
static Color decorationColor(RenderStyle* style)
{
Color result;
#if ENABLE(CSS3_TEXT_DECORATION)
// Check for text decoration color first.
result = style->visitedDependentColor(CSSPropertyWebkitTextDecorationColor);
if (result.isValid())
return result;
#endif // CSS3_TEXT_DECORATION
if (style->textStrokeWidth() > 0) {
// Prefer stroke color if possible but not if it's fully transparent.
result = style->visitedDependentColor(CSSPropertyWebkitTextStrokeColor);
......
Source/WebCore/rendering/RootInlineBox.cpp
View file @ 607bf6e3
......@@ -344,14 +344,12 @@ LayoutUnit RootInlineBox::alignBoxesInBlockDirection(LayoutUnit heightOfBlock, G
return heightOfBlock + maxHeight;
}
#if ENABLE(CSS3_TEXT_DECORATION)
float RootInlineBox::maxLogicalTop() const
{
float maxLogicalTop = 0;
computeMaxLogicalTop(maxLogicalTop);
return maxLogicalTop;
}
#endif // CSS3_TEXT_DECORATION
LayoutUnit RootInlineBox::beforeAnnotationsAdjustment() const
{
......
Source/WebCore/rendering/RootInlineBox.h
View file @ 607bf6e3
......@@ -189,10 +189,8 @@ public:
return InlineFlowBox::logicalBottomLayoutOverflow(lineBottom());
}
#if ENABLE(CSS3_TEXT_DECORATION)
// Used to calculate the underline offset for TextUnderlinePositionUnder.
float maxLogicalTop() const;
#endif
Node* getLogicalStartBoxWithNode(InlineBox*&) const;
Node* getLogicalEndBoxWithNode(InlineBox*&) const;
......
Source/WebCore/rendering/style/RenderStyle.cpp
View file @ 607bf6e3
......@@ -765,11 +765,9 @@ bool RenderStyle::changeRequiresRepaintIfTextOrBorderOrOutline(const RenderStyle
if (inherited->color != other->inherited->color
|| inherited_flags._text_decorations != other->inherited_flags._text_decorations
|| visual->textDecoration != other->visual->textDecoration
#if ENABLE(CSS3_TEXT_DECORATION)
|| rareNonInheritedData->m_textDecorationStyle != other->rareNonInheritedData->m_textDecorationStyle
|| rareNonInheritedData->m_textDecorationColor != other->rareNonInheritedData->m_textDecorationColor
|| rareInheritedData->m_textDecorationSkip != other->rareInheritedData->m_textDecorationSkip
#endif // CSS3_TEXT_DECORATION
|| rareInheritedData->textFillColor != other->rareInheritedData->textFillColor
|| rareInheritedData->textStrokeColor != other->rareInheritedData->textStrokeColor
|| rareInheritedData->textEmphasisColor != other->rareInheritedData->textEmphasisColor
......@@ -1597,11 +1595,9 @@ Color RenderStyle::colorIncludingFallback(int colorProperty, bool visitedLink) c
case CSSPropertyWebkitColumnRuleColor:
result = visitedLink ? visitedLinkColumnRuleColor() : columnRuleColor();
break;
#if ENABLE(CSS3_TEXT_DECORATION)
case CSSPropertyWebkitTextDecorationColor:
// Text decoration color fallback is handled in RenderObject::decorationColor.
return visitedLink ? visitedLinkTextDecorationColor() : textDecorationColor();
#endif
case CSSPropertyWebkitTextEmphasisColor:
result = visitedLink ? visitedLinkTextEmphasisColor() : textEmphasisColor();
break;
......@@ -1633,11 +1629,9 @@ Color RenderStyle::visitedDependentColor(int colorProperty) const
Color visitedColor = colorIncludingFallback(colorProperty, true);
#if ENABLE(CSS3_TEXT_DECORATION)