Index: Source/core/rendering/style/RenderStyle.cpp |
diff --git a/Source/core/rendering/style/RenderStyle.cpp b/Source/core/rendering/style/RenderStyle.cpp |
index c76c82e8ad5419b3ca1d387abd20bfe6d9df41f9..1e91f0f028201df55964c85c9864f2df6b32413f 100644 |
--- a/Source/core/rendering/style/RenderStyle.cpp |
+++ b/Source/core/rendering/style/RenderStyle.cpp |
@@ -617,10 +617,8 @@ StyleDifference RenderStyle::diff(const RenderStyle* other, unsigned& changedCon |
|| rareInheritedData->userSelect != other->rareInheritedData->userSelect |
|| rareNonInheritedData->userDrag != other->rareNonInheritedData->userDrag |
|| rareNonInheritedData->m_borderFit != other->rareNonInheritedData->m_borderFit |
-#if ENABLE(CSS3_TEXT) |
|| rareNonInheritedData->m_textDecorationStyle != other->rareNonInheritedData->m_textDecorationStyle |
|| rareNonInheritedData->m_textDecorationColor != other->rareNonInheritedData->m_textDecorationColor |
-#endif // CSS3_TEXT |
|| rareInheritedData->textFillColor != other->rareInheritedData->textFillColor |
|| rareInheritedData->textStrokeColor != other->rareInheritedData->textStrokeColor |
|| rareInheritedData->textEmphasisColor != other->rareInheritedData->textEmphasisColor |
@@ -1327,11 +1325,9 @@ Color RenderStyle::colorIncludingFallback(int colorProperty, bool visitedLink) c |
case CSSPropertyWebkitColumnRuleColor: |
result = visitedLink ? visitedLinkColumnRuleColor() : columnRuleColor(); |
break; |
-#if ENABLE(CSS3_TEXT) |
- case CSSPropertyWebkitTextDecorationColor: |
+ case CSSPropertyTextDecorationColor: |
// Text decoration color fallback is handled in RenderObject::decorationColor. |
return visitedLink ? visitedLinkTextDecorationColor() : textDecorationColor(); |
-#endif // CSS3_TEXT |
case CSSPropertyWebkitTextEmphasisColor: |
result = visitedLink ? visitedLinkTextEmphasisColor() : textEmphasisColor(); |
break; |
@@ -1363,11 +1359,9 @@ Color RenderStyle::visitedDependentColor(int colorProperty) const |
Color visitedColor = colorIncludingFallback(colorProperty, true); |
-#if ENABLE(CSS3_TEXT) |
// Text decoration color validity is preserved (checked in RenderObject::decorationColor). |
- if (colorProperty == CSSPropertyWebkitTextDecorationColor) |
+ if (colorProperty == CSSPropertyTextDecorationColor) |
return visitedColor; |
-#endif // CSS3_TEXT |
// FIXME: Technically someone could explicitly specify the color transparent, but for now we'll just |
// assume that if the background color is transparent that it wasn't set. Note that it's weird that |