Index: Source/core/css/StylePropertyShorthand.cpp |
diff --git a/Source/core/css/StylePropertyShorthand.cpp b/Source/core/css/StylePropertyShorthand.cpp |
index 8d0de73e067d1f061be88c4db7e47e9ab22ea216..badf3be58d6c10e42e313fe22aca5199eb3c92f0 100644 |
--- a/Source/core/css/StylePropertyShorthand.cpp |
+++ b/Source/core/css/StylePropertyShorthand.cpp |
@@ -465,6 +465,17 @@ const StylePropertyShorthand& webkitMaskRepeatShorthand() |
return webkitMaskRepeatLonghands; |
} |
+const StylePropertyShorthand& textDecorationShorthand() |
+{ |
+ static const CSSPropertyID textDecorationProperties[] = { |
+ CSSPropertyTextDecorationLine, |
+ CSSPropertyTextDecorationStyle, |
+ CSSPropertyTextDecorationColor |
+ }; |
+ DEFINE_STATIC_LOCAL(StylePropertyShorthand, textDecorationLonghands, (CSSPropertyTextDecoration, textDecorationProperties, WTF_ARRAY_LENGTH(textDecorationProperties))); |
+ return textDecorationLonghands; |
+} |
+ |
const StylePropertyShorthand& webkitTextEmphasisShorthand() |
{ |
static const CSSPropertyID textEmphasisProperties[] = { |
@@ -569,6 +580,8 @@ const StylePropertyShorthand& shorthandForProperty(CSSPropertyID propertyID) |
return overflowShorthand(); |
case CSSPropertyPadding: |
return paddingShorthand(); |
+ case CSSPropertyTextDecoration: |
+ return textDecorationShorthand(); |
case CSSPropertyTransition: |
return transitionShorthand(); |
case CSSPropertyWebkitAnimation: |
@@ -905,6 +918,12 @@ const Vector<StylePropertyShorthand> matchingShorthandsForLonghand(CSSPropertyID |
map.set(CSSPropertyWebkitMaskRepeatX, maskRepeat); |
map.set(CSSPropertyWebkitMaskRepeatY, maskRepeat); |
+ Vector<StylePropertyShorthand, 1> textDecoration; |
+ textDecoration.uncheckedAppend(textDecorationShorthand()); |
+ map.set(CSSPropertyTextDecorationLine, textDecoration); |
+ map.set(CSSPropertyTextDecorationStyle, textDecoration); |
+ map.set(CSSPropertyTextDecorationColor, textDecoration); |
+ |
Vector<StylePropertyShorthand, 1> textEmphasis; |
textEmphasis.uncheckedAppend(webkitTextEmphasisShorthand()); |
map.set(CSSPropertyWebkitTextEmphasisStyle, textEmphasis); |