Move isValid/isCurrentColor from Color to StyleColor

Source/core/rendering/RenderObject.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 1636 matching lines @@
 
 #endif // NDEBUG
 
 static bool shouldUseSelectionColor(const RenderStyle& style)
 {
     return style.userSelect() != SELECT_NONE || style.userModify() != READ_ONLY;
 }
 
 Color RenderObject::selectionBackgroundColor() const
 {
-    Color color;
+    Color backgroundColor= Color::transparent;
     if (shouldUseSelectionColor(*style())) {
         RefPtr<RenderStyle> pseudoStyle = getUncachedPseudoStyle(PseudoStyleRequest(SELECTION));
-        if (pseudoStyle && resolveColor(pseudoStyle.get(), CSSPropertyBackgroundColor).isValid())
-            color = resolveColor(pseudoStyle.get(), CSSPropertyBackgroundColor).blendWithWhite();
-        else
-            color = frame()->selection()->isFocusedAndActive() ?
-                    theme()->activeSelectionBackgroundColor() :
-                    theme()->inactiveSelectionBackgroundColor();
+        if (pseudoStyle) {
+            StyleColor styleColor = resolveCurrentColor(pseudoStyle.get(), CSSPropertyBackgroundColor);
+            if (styleColor.isValid())
+                return styleColor.color().blendWithWhite();
+        }
+
+        backgroundColor = frame()->selection()->isFocusedAndActive() ?
+            theme()->activeSelectionBackgroundColor() :
+            theme()->inactiveSelectionBackgroundColor();
     }
 
-    return color;
+    return backgroundColor;
 }
 
 Color RenderObject::selectionColor(int colorProperty) const
 {
-    Color color;
     // If the element is unselectable, or we are only painting the selection,
     // don't override the foreground color with the selection foreground color.
     if (!shouldUseSelectionColor(*style())
         || (frame()->view()->paintBehavior() & PaintBehaviorSelectionOnly))
-        return color;
+        return Color::transparent;
 
+    Color color;
     if (RefPtr<RenderStyle> pseudoStyle = getUncachedPseudoStyle(PseudoStyleRequest(SELECTION))) {
-        Color selectionColor = resolveColor(pseudoStyle.get(), colorProperty);
-        color = selectionColor.isValid() ? selectionColor : resolveColor(pseudoStyle.get(), CSSPropertyColor);
+        StyleColor styleColor = resolveCurrentColor(pseudoStyle.get(), colorProperty);
+        color = styleColor.isValid() ? styleColor.color() : resolveColor(pseudoStyle.get(), CSSPropertyColor);
     } else
         color = frame()->selection()->isFocusedAndActive() ?
                 theme()->activeSelectionForegroundColor() :
                 theme()->inactiveSelectionForegroundColor();
 
     return color;
 }
 
 Color RenderObject::selectionForegroundColor() const
 {
@@ skipping 1170 matching lines @@
     return document()->styleResolver()->pseudoStyleForElement(element, pseudoStyleRequest, parentStyle);
 }
 
 bool RenderObject::hasBlendMode() const
 {
     return RuntimeEnabledFeatures::cssCompositingEnabled() && style() && style()->hasBlendMode();
 }
 
 static Color decorationColor(const RenderObject* object, RenderStyle* style)
 {
-    Color result;
+    StyleColor result;
     // Check for text decoration color first.
-    result = object->resolveColor(style, CSSPropertyTextDecorationColor);
+    result = object->resolveStyleColor(style, CSSPropertyTextDecorationColor);
     if (result.isValid())
-        return result;
+        return result.color();
     if (style->textStrokeWidth() > 0) {
         // Prefer stroke color if possible but not if it's fully transparent.
         result = object->resolveColor(style, CSSPropertyWebkitTextStrokeColor);
         if (result.alpha())
-            return result;
+            return result.color();
     }
     
     result = object->resolveColor(style, CSSPropertyWebkitTextFillColor);
-    return result;
+    return result.color();
 }
 
 void RenderObject::getTextDecorationColors(int decorations, Color& underline, Color& overline,
                                            Color& linethrough, bool quirksMode, bool firstlineStyle)
 {
     RenderObject* curr = this;
     RenderStyle* styleToUse = 0;
     TextDecoration currDecs = TextDecorationNone;
     Color resultColor;
     do {
@@ skipping 383 matching lines @@
 {
     if (object1) {
         const WebCore::RenderObject* root = object1;
         while (root->parent())
             root = root->parent();
         root->showRenderTreeAndMark(object1, "*", object2, "-", 0);
     }
 }
 
 #endif