Index: Source/core/css/CSSProperty.cpp |
diff --git a/Source/core/css/CSSProperty.cpp b/Source/core/css/CSSProperty.cpp |
index 93282bd7397b10a846a6afa39a1ac7016fc6a91e..c51fc611be74729eb54bea7698f8188e33b7dba9 100644 |
--- a/Source/core/css/CSSProperty.cpp |
+++ b/Source/core/css/CSSProperty.cpp |
@@ -280,6 +280,7 @@ bool CSSProperty::isInheritedProperty(CSSPropertyID propertyID) |
case CSSPropertyTabSize: |
case CSSPropertyTextAlign: |
case CSSPropertyTextDecoration: |
+ case CSSPropertyTextDecorationLine: |
case CSSPropertyTextIndent: |
case CSSPropertyTextRendering: |
case CSSPropertyTextShadow: |
@@ -315,7 +316,6 @@ bool CSSProperty::isInheritedProperty(CSSPropertyID propertyID) |
case CSSPropertyWebkitRubyPosition: |
case CSSPropertyWebkitTextCombine: |
#if ENABLE(CSS3_TEXT) |
- case CSSPropertyWebkitTextDecorationLine: |
case CSSPropertyWebkitTextAlignLast: |
case CSSPropertyWebkitTextUnderlinePosition: |
#endif // CSS3_TEXT |
@@ -460,6 +460,8 @@ bool CSSProperty::isInheritedProperty(CSSPropertyID propertyID) |
case CSSPropertySize: |
case CSSPropertySrc: |
case CSSPropertyTableLayout: |
+ case CSSPropertyTextDecorationStyle: |
+ case CSSPropertyTextDecorationColor: |
case CSSPropertyTextLineThrough: |
case CSSPropertyTextLineThroughColor: |
case CSSPropertyTextLineThroughMode: |
@@ -619,10 +621,6 @@ bool CSSProperty::isInheritedProperty(CSSPropertyID propertyID) |
case CSSPropertyWebkitPerspectiveOrigin: |
case CSSPropertyWebkitPerspectiveOriginX: |
case CSSPropertyWebkitPerspectiveOriginY: |
-#if ENABLE(CSS3_TEXT) |
- case CSSPropertyWebkitTextDecorationStyle: |
- case CSSPropertyWebkitTextDecorationColor: |
-#endif // CSS3_TEXT |
case CSSPropertyWebkitTransform: |
case CSSPropertyWebkitTransformOrigin: |
case CSSPropertyWebkitTransformOriginX: |