| Index: Source/core/rendering/style/RenderStyle.cpp
|
| diff --git a/Source/core/rendering/style/RenderStyle.cpp b/Source/core/rendering/style/RenderStyle.cpp
|
| index 761c0d5e9501a9b9e70b59db08c45870a56b1561..afa29e298984124cb0764d7e90faeba72c8e4fc3 100644
|
| --- a/Source/core/rendering/style/RenderStyle.cpp
|
| +++ b/Source/core/rendering/style/RenderStyle.cpp
|
| @@ -642,10 +642,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
|
| @@ -1352,11 +1350,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;
|
| @@ -1388,11 +1384,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
|
|
|