Change rendering code to use RenderObject::resolveColor

Source/core/rendering/RenderTreeAsText.cpp

 /*
  * Copyright (C) 2004, 2006, 2007 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 181 matching lines @@
                 result.append('{');
                 appendUnsignedAsHex(c, result); 
                 result.append('}');
             }
         }
     }
     result.append('"');
     return result.toString();
 }
 
+static inline Color colorWithFallback(const RenderObject& o, const Color& color)
+{
+    return color.isValid() ? color : o.resolveColor(CSSPropertyColor);
+}
+
 void RenderTreeAsText::writeRenderObject(TextStream& ts, const RenderObject& o, RenderAsTextBehavior behavior)
 {
     ts << o.renderName();
 
     if (behavior & RenderAsTextShowAddresses)
         ts << " " << static_cast<const void*>(&o);
 
     if (o.style() && o.style()->zIndex())
         ts << " zI: " << o.style()->zIndex();
 
@@ skipping 43 matching lines @@
 
     // FIXME: Convert layout test results to report sub-pixel values, in the meantime using enclosingIntRect
     // for consistency with old results.
     ts << " " << enclosingIntRect(r);
 
     if (!(o.isText() && !o.isBR())) {
         if (o.isFileUploadControl())
             ts << " " << quoteAndEscapeNonPrintables(toRenderFileUploadControl(&o)->fileTextValue());
 
         if (o.parent()) {
-            Color color = o.style()->visitedDependentColor(CSSPropertyColor);
-            if (o.parent()->style()->visitedDependentColor(CSSPropertyColor) != color)
+            Color color = o.resolveColor(CSSPropertyColor);
+            if (o.parent()->resolveColor(CSSPropertyColor) != color)
                 ts << " [color=" << color.nameForRenderTreeAsText() << "]";
 
             // Do not dump invalid or transparent backgrounds, since that is the default.
-            Color backgroundColor = o.style()->visitedDependentColor(CSSPropertyBackgroundColor);
-            if (o.parent()->style()->visitedDependentColor(CSSPropertyBackgroundColor) != backgroundColor
+            Color backgroundColor = o.resolveColor(CSSPropertyBackgroundColor);
+            if (o.parent()->resolveColor(CSSPropertyBackgroundColor) != backgroundColor
                 && backgroundColor.isValid() && backgroundColor.rgb())
                 ts << " [bgcolor=" << backgroundColor.nameForRenderTreeAsText() << "]";
             
-            Color textFillColor = o.style()->visitedDependentColor(CSSPropertyWebkitTextFillColor);
-            if (o.parent()->style()->visitedDependentColor(CSSPropertyWebkitTextFillColor) != textFillColor
+            Color textFillColor = o.resolveColor(CSSPropertyWebkitTextFillColor);
+            if (o.parent()->resolveColor(CSSPropertyWebkitTextFillColor) != textFillColor
                 && textFillColor.isValid() && textFillColor != color && textFillColor.rgb())
                 ts << " [textFillColor=" << textFillColor.nameForRenderTreeAsText() << "]";
 
-            Color textStrokeColor = o.style()->visitedDependentColor(CSSPropertyWebkitTextStrokeColor);
-            if (o.parent()->style()->visitedDependentColor(CSSPropertyWebkitTextStrokeColor) != textStrokeColor
+            Color textStrokeColor = o.resolveColor(CSSPropertyWebkitTextStrokeColor);
+            if (o.parent()->resolveColor(CSSPropertyWebkitTextStrokeColor) != textStrokeColor
                 && textStrokeColor.isValid() && textStrokeColor != color && textStrokeColor.rgb())
                 ts << " [textStrokeColor=" << textStrokeColor.nameForRenderTreeAsText() << "]";
 
             if (o.parent()->style()->textStrokeWidth() != o.style()->textStrokeWidth() && o.style()->textStrokeWidth() > 0)
                 ts << " [textStrokeWidth=" << o.style()->textStrokeWidth() << "]";
         }
 
         if (!o.isBoxModelObject())
             return;
 
         const RenderBoxModelObject& box = *toRenderBoxModelObject(&o);
         if (box.borderTop() || box.borderRight() || box.borderBottom() || box.borderLeft()) {
             ts << " [border:";
 
             BorderValue prevBorder = o.style()->borderTop();
             if (!box.borderTop())
                 ts << " none";
             else {
                 ts << " (" << box.borderTop() << "px ";
                 printBorderStyle(ts, o.style()->borderTopStyle());
-                Color col = o.style()->borderTopColor();
-                if (!col.isValid())
-                    col = o.style()->color();
+                Color col = colorWithFallback(o, o.style()->borderTopColor());
                 ts << col.nameForRenderTreeAsText() << ")";
             }
 
             if (o.style()->borderRight() != prevBorder) {
                 prevBorder = o.style()->borderRight();
                 if (!box.borderRight())
                     ts << " none";
                 else {
                     ts << " (" << box.borderRight() << "px ";
                     printBorderStyle(ts, o.style()->borderRightStyle());
-                    Color col = o.style()->borderRightColor();
-                    if (!col.isValid())
-                        col = o.style()->color();
+                    Color col = colorWithFallback(o, o.style()->borderRightColor());
                     ts << col.nameForRenderTreeAsText() << ")";
                 }
             }
 
             if (o.style()->borderBottom() != prevBorder) {
                 prevBorder = box.style()->borderBottom();
                 if (!box.borderBottom())
                     ts << " none";
                 else {
                     ts << " (" << box.borderBottom() << "px ";
                     printBorderStyle(ts, o.style()->borderBottomStyle());
-                    Color col = o.style()->borderBottomColor();
-                    if (!col.isValid())
-                        col = o.style()->color();
+                    Color col = colorWithFallback(o, o.style()->borderBottomColor());
                     ts << col.nameForRenderTreeAsText() << ")";
                 }
             }
 
             if (o.style()->borderLeft() != prevBorder) {
                 prevBorder = o.style()->borderLeft();
                 if (!box.borderLeft())
                     ts << " none";
                 else {
                     ts << " (" << box.borderLeft() << "px ";
                     printBorderStyle(ts, o.style()->borderLeftStyle());
-                    Color col = o.style()->borderLeftColor();
-                    if (!col.isValid())
-                        col = o.style()->color();
+                    Color col = colorWithFallback(o, o.style()->borderLeftColor());
                     ts << col.nameForRenderTreeAsText() << ")";
                 }
             }
 
             ts << "]";
         }
     }
 
     if (o.isTableCell()) {
         const RenderTableCell& c = *toRenderTableCell(&o);
@@ skipping 507 matching lines @@
     element->document()->updateLayout();
 
     RenderObject* renderer = element->renderer();
     if (!renderer || !renderer->isListItem())
         return String();
 
     return toRenderListItem(renderer)->markerText();
 }
 
 } // namespace WebCore