Store resolved color in AppliedTextDecoration

Source/core/style/ComputedStyle.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 719 matching lines @@
         if (rareNonInheritedData->opacity != other.rareNonInheritedData->opacity)
             diff.setOpacityChanged();
 
         if (rareNonInheritedData->m_filter != other.rareNonInheritedData->m_filter)
             diff.setFilterChanged();
     }
 
     if (!diff.needsPaintInvalidation()) {
         if (inherited->color != other.inherited->color
             || inherited->visitedLinkColor != other.inherited->visitedLinkColor
-            || inherited_flags.m_textUnderline != other.inherited_flags.m_textUnderline
             || visual->textDecoration != other.visual->textDecoration) {
             diff.setTextOrColorChanged();
         } else if (rareNonInheritedData.get() != other.rareNonInheritedData.get()
             && (rareNonInheritedData->m_textDecorationStyle != other.rareNonInheritedData->m_textDecorationStyle
                 || rareNonInheritedData->m_textDecorationColor != other.rareNonInheritedData->m_textDecorationColor
                 || rareNonInheritedData->m_visitedLinkTextDecorationColor != other.rareNonInheritedData->m_visitedLinkTextDecorationColor)) {
                 diff.setTextOrColorChanged();
         } else if (rareInheritedData.get() != other.rareInheritedData.get()
             && (rareInheritedData->textFillColor() != other.rareInheritedData->textFillColor()
                 || rareInheritedData->textStrokeColor() != other.rareInheritedData->textStrokeColor()
@@ skipping 456 matching lines @@
     const Vector<AppliedTextDecoration>& applied = appliedTextDecorations();
 
     for (size_t i = 0; i < applied.size(); ++i)
         decorations |= applied[i].line();
 
     return static_cast<TextDecoration>(decorations);
 }
 
 const Vector<AppliedTextDecoration>& ComputedStyle::appliedTextDecorations() const
 {
-    if (!inherited_flags.m_textUnderline && !rareInheritedData->appliedTextDecorations) {
+    if (!isSimpleUnderlineDecoration() && !rareInheritedData->appliedTextDecorations) {
         DEFINE_STATIC_LOCAL(Vector<AppliedTextDecoration>, empty, ());
         return empty;
     }
-    if (inherited_flags.m_textUnderline) {
+    if (isSimpleUnderlineDecoration()) {
         DEFINE_STATIC_LOCAL(Vector<AppliedTextDecoration>, underline, (1, AppliedTextDecoration(TextDecorationUnderline)));
         return underline;
     }
 
     return rareInheritedData->appliedTextDecorations->vector();
 }
 
 float ComputedStyle::wordSpacing() const { return fontDescription().wordSpacing(); }
 float ComputedStyle::letterSpacing() const { return fontDescription().letterSpacing(); }
 
@@ skipping 83 matching lines @@
 
 void ComputedStyle::addAppliedTextDecoration(const AppliedTextDecoration& decoration)
 {
     RefPtr<AppliedTextDecorationList>& list = rareInheritedData.access()->appliedTextDecorations;
 
     if (!list)
         list = AppliedTextDecorationList::create();
     else if (!list->hasOneRef())
         list = list->copy();
 
-    if (inherited_flags.m_textUnderline) {
-        inherited_flags.m_textUnderline = false;
+    if (isSimpleUnderlineDecoration()) {
         list->append(AppliedTextDecoration(TextDecorationUnderline));
     }
 
     list->append(decoration);
 }
 
-void ComputedStyle::applyTextDecorations()
+void ComputedStyle::applyTextDecorations(const ComputedStyle& parentStyle)
 {
-    if (textDecoration() == TextDecorationNone)
+    if (textDecoration() == TextDecorationNone) {
+        if (hasOutOfFlowPosition() || isFloating()) {

[samahto, 2015/05/17 17:12:40]

[spec says]: "text decorations are not propagated to floating and absolutely
positioned descendants, nor to the contents of atomic inline-level descendants
such as inline blocks and inline tables."

The above line handles this case.Hope to get some suggestion if better things
can be done here

[wkorman, 2015/07/01 15:16:14]

Add layout tests to validate this works as expected?

+            clearAppliedTextDecorations();
+            return;
+        }
+        if ((parentStyle.isSimpleUnderlineDecoration())) {
+            TextDecorationStyle style = parentStyle.textDecorationStyle();
+            Color color = parentStyle.visitedDependentColor(CSSPropertyTextDecorationColor);
+            addAppliedTextDecoration(AppliedTextDecoration(TextDecorationUnderline, style, color));
+        }
         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);
-
-        if (!rareInheritedData->appliedTextDecorations && underline.isSimpleUnderline())
-            inherited_flags.m_textUnderline = true;
-        else
+        AppliedTextDecoration underline(TextDecorationUnderline, style, resolvedColor);
+        if (rareInheritedData->appliedTextDecorations || !styleColor.isCurrentColor())
             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 ComputedStyle::clearAppliedTextDecorations()
 {
-    inherited_flags.m_textUnderline = false;
-
     if (rareInheritedData->appliedTextDecorations)
         rareInheritedData.access()->appliedTextDecorations = nullptr;
 }
 
 void ComputedStyle::clearMultiCol()
 {
     rareNonInheritedData.access()->m_multiCol = nullptr;
     rareNonInheritedData.access()->m_multiCol.init();
 }
 
@@ skipping 319 matching lines @@
 {
     if (!hasBorder())
         return false;
 
     // Bail if we have any border-image for now. We could look at the image alpha to improve this.
     if (borderImage().image())
         return false;
 
     BorderEdge edges[4];
     getBorderEdgeInfo(edges);
-
     for (int i = BSTop; i <= BSLeft; ++i) {
         const BorderEdge& currEdge = edges[i];
         if (!currEdge.obscuresBackground())
             return false;
     }
 
     return true;
 }
 
 void ComputedStyle::getBorderEdgeInfo(BorderEdge edges[], bool includeLogicalLeftEdge, bool includeLogicalRightEdge) const
@@ skipping 19 matching lines @@
         horizontal || includeLogicalRightEdge);
 
     edges[BSLeft] = BorderEdge(borderLeftWidth(),
         visitedDependentColor(CSSPropertyBorderLeftColor),
         borderLeftStyle(),
         borderLeftIsTransparent(),
         !horizontal || includeLogicalLeftEdge);
 }
 
 } // namespace blink