Store resolved color in AppliedTextDecoration

Source/core/layout/LayoutObject.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2000 Dirk Mueller (mueller@kde.org)
  *           (C) 2004 Allan Sandfeld Jensen (kde@carewolf.com)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2009 Google Inc. All rights reserved.
  * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  *
  * This library is free software; you can redistribute it and/or
@@ skipping 1581 matching lines @@
     if (diff.filterChanged() && hasLayer()) {
         Layer* layer = toLayoutBoxModelObject(this)->layer();
         if (!layer->hasStyleDeterminedDirectCompositingReasons() || layer->paintsWithFilters())
             diff.setNeedsPaintInvalidationLayer();
     }
 
     if (diff.textOrColorChanged() && !diff.needsPaintInvalidation()) {
         if (style()->hasBorder() || style()->hasOutline()
             || (isText() && !toLayoutText(this)->isAllCollapsibleWhitespace()))
             diff.setNeedsPaintInvalidationObject();
+        if (style()->hasSimpleUnderlineTextDecoration())
+            style()->adjustTextDecorationDifference();

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

This seems a bit weird. I don't think we should be updating the style object in
here. The call to this function isn't wrapped in styleWillChange/styleDidChange.

     }
 
     // The answer to layerTypeRequired() for plugins, iframes, and canvas can change without the actual
     // style changing, since it depends on whether we decide to composite these elements. When the
     // layer status of one of these elements changes, we need to force a layout.
     if (!diff.needsFullLayout() && style() && isLayoutBoxModelObject()) {
         bool requiresLayer = toLayoutBoxModelObject(this)->layerTypeRequired() != NoLayer;
         if (hasLayer() != requiresLayer)
             diff.setNeedsFullLayout();
     }
@@ skipping 1144 matching lines @@
     do {
         styleToUse = curr->style(firstlineStyle);
         currDecs = styleToUse->textDecoration();
         currDecs &= decorations;
         resultColor = styleToUse->visitedDependentColor(CSSPropertyTextDecorationColor);
         resultStyle = styleToUse->textDecorationStyle();
         // Parameter 'decorations' is cast as an int to enable the bitwise operations below.
         if (currDecs) {
             if (currDecs & TextDecorationUnderline) {
                 decorations &= ~TextDecorationUnderline;
-                underline.color = resultColor;
-                underline.style = resultStyle;
+                underline.setColor(resultColor);
+                underline.setStyle(resultStyle);
             }
             if (currDecs & TextDecorationOverline) {
                 decorations &= ~TextDecorationOverline;
-                overline.color = resultColor;
-                overline.style = resultStyle;
+                overline.setColor(resultColor);
+                overline.setStyle(resultStyle);
             }
             if (currDecs & TextDecorationLineThrough) {
                 decorations &= ~TextDecorationLineThrough;
-                linethrough.color = resultColor;
-                linethrough.style = resultStyle;
+                linethrough.setColor(resultColor);
+                linethrough.setStyle(resultStyle);
             }
         }
         if (curr->isRubyText())
             return;
         curr = curr->parent();
         if (curr && curr->isAnonymousBlock() && toLayoutBlock(curr)->continuation())
             curr = toLayoutBlock(curr)->continuation();
     } while (curr && decorations && (!quirksMode || !curr->node() || (!isHTMLAnchorElement(*curr->node()) && !isHTMLFontElement(*curr->node()))));
 
     // If we bailed out, use the element we bailed out at (typically a <font> or <a> element).
     if (decorations && curr) {
         styleToUse = curr->style(firstlineStyle);
         resultColor = styleToUse->visitedDependentColor(CSSPropertyTextDecorationColor);
         if (decorations & TextDecorationUnderline) {
-            underline.color = resultColor;
-            underline.style = resultStyle;
+            underline.setColor(resultColor);
+            underline.setStyle(resultStyle);
         }
         if (decorations & TextDecorationOverline) {
-            overline.color = resultColor;
-            overline.style = resultStyle;
+            overline.setColor(resultColor);
+            overline.setStyle(resultStyle);
         }
         if (decorations & TextDecorationLineThrough) {
-            linethrough.color = resultColor;
-            linethrough.style = resultStyle;
+            linethrough.setColor(resultColor);
+            linethrough.setStyle(resultStyle);
         }
     }
 }
 
 void LayoutObject::addAnnotatedRegions(Vector<AnnotatedRegionValue>& regions)
 {
     // Convert the style regions to absolute coordinates.
     if (style()->visibility() != VISIBLE || !isBox())
         return;
 
@@ skipping 406 matching lines @@
 {
     if (object1) {
         const blink::LayoutObject* root = object1;
         while (root->parent())
             root = root->parent();
         root->showLayoutTreeAndMark(object1, "*", object2, "-", 0);
     }
 }
 
 #endif