Respect fallback colors when interpolating text-decoration-color.

Source/core/rendering/style/RenderStyle.cpp

 /*
  * Copyright (C) 1999 Antti Koivisto (koivisto@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
  * Copyright (C) 2011 Adobe Systems Incorporated. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
@@ skipping 1253 matching lines @@
 
     list->append(decoration);
 }
 
 void RenderStyle::applyTextDecorations()
 {
     if (textDecoration() == TextDecorationNone)
         return;
 
     TextDecorationStyle style = textDecorationStyle();
-    StyleColor styleColor = visitedDependentDecorationStyleColor();
+    StyleColor styleColor = decorationColorIncludingFallback(insideLink() == InsideVisitedLink);
 
     int decorations = textDecoration();
 
     if (decorations & TextDecorationUnderline) {
         // To save memory, we don't use AppliedTextDecoration objects in the
         // common case of a single simple underline.
         AppliedTextDecoration underline(TextDecorationUnderline, style, styleColor);
 
         if (!rareInheritedData->appliedTextDecorations && underline.isSimpleUnderline())
             inherited_flags.m_textUnderline = true;
@@ skipping 90 matching lines @@
         const ShadowData& shadow = shadowList->shadows()[i];
         if (shadow.style() == Inset)
             continue;
         float blurAndSpread = shadow.blur() + shadow.spread();
 
         top = std::min<LayoutUnit>(top, shadow.y() - blurAndSpread);
         bottom = std::max<LayoutUnit>(bottom, shadow.y() + blurAndSpread);
     }
 }
 
-StyleColor RenderStyle::visitedDependentDecorationStyleColor() const
+StyleColor RenderStyle::decorationColorIncludingFallback(bool visitedLink) const
 {
-    bool isVisited = insideLink() == InsideVisitedLink;
-
-    StyleColor styleColor = isVisited ? visitedLinkTextDecorationColor() : textDecorationColor();
+    StyleColor styleColor = visitedLink ? visitedLinkTextDecorationColor() : textDecorationColor();
 
     if (!styleColor.isCurrentColor())
         return styleColor;
 
     if (textStrokeWidth()) {
         // Prefer stroke color if possible, but not if it's fully transparent.
-        StyleColor textStrokeStyleColor = isVisited ? visitedLinkTextStrokeColor() : textStrokeColor();
+        StyleColor textStrokeStyleColor = visitedLink ? visitedLinkTextStrokeColor() : textStrokeColor();
         if (!textStrokeStyleColor.isCurrentColor() && textStrokeStyleColor.color().alpha())
             return textStrokeStyleColor;
     }
 
-    return isVisited ? visitedLinkTextFillColor() : textFillColor();
-}
-
-Color RenderStyle::visitedDependentDecorationColor() const
-{
-    bool isVisited = insideLink() == InsideVisitedLink;
-    return visitedDependentDecorationStyleColor().resolve(isVisited ? visitedLinkColor() : color());
+    return visitedLink ? visitedLinkTextFillColor() : textFillColor();
 }
 
 Color RenderStyle::colorIncludingFallback(int colorProperty, bool visitedLink) const
 {
     StyleColor result(StyleColor::currentColor());
     EBorderStyle borderStyle = BNONE;
     switch (colorProperty) {
     case CSSPropertyBackgroundColor:
         result = visitedLink ? visitedLinkBackgroundColor() : backgroundColor();
         break;
@@ skipping 36 matching lines @@
         break;
     case CSSPropertyLightingColor:
         result = lightingColor();
         break;
     case CSSPropertyStopColor:
         result = stopColor();
         break;
     case CSSPropertyWebkitTapHighlightColor:
         result = tapHighlightColor();
         break;
+    case CSSPropertyTextDecorationColor:
+        result = decorationColorIncludingFallback(visitedLink);
+        break;
     default:
         ASSERT_NOT_REACHED();
         break;
     }
 
     if (!result.isCurrentColor())
         return result.color();
 
     // FIXME: Treating styled borders with initial color differently causes problems
     // See crbug.com/316559, crbug.com/276231
@@ skipping 281 matching lines @@
         horizontal || includeLogicalRightEdge);
 
     edges[BSLeft] = BorderEdge(borderLeftWidth(),
         visitedDependentColor(CSSPropertyBorderLeftColor),
         borderLeftStyle(),
         borderLeftIsTransparent(),
         !horizontal || includeLogicalLeftEdge);
 }
 
 } // namespace blink