Store resolved color in AppliedTextDecoration

Source/core/layout/style/LayoutStyle.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 1302 matching lines @@
         list = list->copy();
 
     if (inherited_flags.m_textUnderline) {
         inherited_flags.m_textUnderline = false;
         list->append(AppliedTextDecoration(TextDecorationUnderline));
     }
 
     list->append(decoration);
 }
 
+bool LayoutStyle::hasSimpleUnderlineTextDecoration()
+{
+    int decorations = textDecoration();

[Timothy Loh, 2015/03/25 00:26:23]

Don't think we should have to check this. If you like we can assert that we have
the TextDecorationUnderline bit set when m_textUnderline is set.

+    return inherited_flags.m_textUnderline && (decorations & TextDecorationUnderline);
+}
+
+void LayoutStyle::adjustTextDecorationDifference()
+{
+    Color color = visitedDependentColor(CSSPropertyTextDecorationColor);
+    TextDecorationStyle style = textDecorationStyle();

[Timothy Loh, 2015/03/25 00:26:23]

Is this always TextDecorationUnderline when we get here?

+
+    AppliedTextDecoration underline(TextDecorationUnderline, style, color);
+    addAppliedTextDecoration(underline);
+}
+
 void LayoutStyle::applyTextDecorations()
 {
     if (textDecoration() == TextDecorationNone)
         return;
 
     TextDecorationStyle style = textDecorationStyle();
     StyleColor styleColor = decorationColorIncludingFallback(insideLink() == InsideVisitedLink);
+    Color resolvedColor = styleColor.resolve(color());
 
     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);
+        AppliedTextDecoration underline(TextDecorationUnderline, style, resolvedColor);
 
-        if (!rareInheritedData->appliedTextDecorations && underline.isSimpleUnderline())
+        if (!rareInheritedData->appliedTextDecorations && underline.isSimpleUnderline(styleColor.isCurrentColor()))

[Timothy Loh, 2015/03/25 00:26:23]

I think this is just
if (!rareInheritedData->appliedTextDecorations && styleColor.isCurrentColor()))

             inherited_flags.m_textUnderline = true;
         else
             addAppliedTextDecoration(underline);
     }
     if (decorations & TextDecorationOverline)
-        addAppliedTextDecoration(AppliedTextDecoration(TextDecorationOverline, style, styleColor));
+        addAppliedTextDecoration(AppliedTextDecoration(TextDecorationOverline, style, resolvedColor));
     if (decorations & TextDecorationLineThrough)
-        addAppliedTextDecoration(AppliedTextDecoration(TextDecorationLineThrough, style, styleColor));
+        addAppliedTextDecoration(AppliedTextDecoration(TextDecorationLineThrough, style, resolvedColor));
 }
 
 void LayoutStyle::clearAppliedTextDecorations()
 {
     inherited_flags.m_textUnderline = false;
 
     if (rareInheritedData->appliedTextDecorations)
         rareInheritedData.access()->appliedTextDecorations = nullptr;
 }
 
@@ skipping 365 matching lines @@
         horizontal || includeLogicalRightEdge);
 
     edges[BSLeft] = BorderEdge(borderLeftWidth(),
         visitedDependentColor(CSSPropertyBorderLeftColor),
         borderLeftStyle(),
         borderLeftIsTransparent(),
         !horizontal || includeLogicalLeftEdge);
 }
 
 } // namespace blink