Revert r154797: "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 1644 matching lines @@
 
 #endif // NDEBUG
 
 bool RenderObject::isSelectable() const
 {
     return !isInert() && !(style()->userSelect() == SELECT_NONE && style()->userModify() == READ_ONLY);
 }
 
 Color RenderObject::selectionBackgroundColor() const
 {
-    Color backgroundColor= Color::transparent;
+    Color backgroundColor;
     if (isSelectable()) {
         RefPtr<RenderStyle> pseudoStyle = getUncachedPseudoStyle(PseudoStyleRequest(SELECTION));
-        if (pseudoStyle) {
-            StyleColor styleColor = resolveCurrentColor(pseudoStyle.get(), CSSPropertyBackgroundColor);
-            if (styleColor.isValid())
-                return styleColor.color().blendWithWhite();
+        if (pseudoStyle && resolveColor(pseudoStyle.get(), CSSPropertyBackgroundColor).isValid()) {
+            backgroundColor = resolveColor(pseudoStyle.get(), CSSPropertyBackgroundColor).blendWithWhite();
+        } else {
+            backgroundColor = frame()->selection().isFocusedAndActive() ?
+                RenderTheme::theme().activeSelectionBackgroundColor() :
+                RenderTheme::theme().inactiveSelectionBackgroundColor();
         }
-
-        backgroundColor = frame()->selection().isFocusedAndActive() ?
-            RenderTheme::theme().activeSelectionBackgroundColor() :
-            RenderTheme::theme().inactiveSelectionBackgroundColor();
     }
 
     return backgroundColor;
 }
 
 Color RenderObject::selectionColor(int colorProperty) const
 {
     // If the element is unselectable, or we are only painting the selection,
     // don't override the foreground color with the selection foreground color.
     if (!isSelectable() || (frame()->view()->paintBehavior() & PaintBehaviorSelectionOnly))
         return Color::transparent;
 
     Color color;
     if (RefPtr<RenderStyle> pseudoStyle = getUncachedPseudoStyle(PseudoStyleRequest(SELECTION))) {
-        StyleColor styleColor = resolveCurrentColor(pseudoStyle.get(), colorProperty);
-        color = styleColor.isValid() ? styleColor.color() : resolveColor(pseudoStyle.get(), CSSPropertyColor);
+        Color selectionColor = resolveColor(pseudoStyle.get(), colorProperty);
+        color = selectionColor.isValid() ? selectionColor : resolveColor(pseudoStyle.get(), CSSPropertyColor);
     } else {
         color = frame()->selection().isFocusedAndActive() ?
             RenderTheme::theme().activeSelectionForegroundColor() :
             RenderTheme::theme().inactiveSelectionForegroundColor();
     }
+
     return color;
 }
 
 Color RenderObject::selectionForegroundColor() const
 {
     return selectionColor(CSSPropertyWebkitTextFillColor);
 }
 
 Color RenderObject::selectionEmphasisMarkColor() const
 {
@@ skipping 1195 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)
 {
-    StyleColor result;
+    Color result;
     // Check for text decoration color first.
-    result = object->resolveStyleColor(style, CSSPropertyTextDecorationColor);
+    result = object->resolveColor(style, CSSPropertyTextDecorationColor);
     if (result.isValid())
-        return result.color();
+        return result;
     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.color();
+            return result;
     }
 
     result = object->resolveColor(style, CSSPropertyWebkitTextFillColor);
-    return result.color();
+    return result;
 }
 
 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 380 matching lines @@
 {
     if (object1) {
         const WebCore::RenderObject* root = object1;
         while (root->parent())
             root = root->parent();
         root->showRenderTreeAndMark(object1, "*", object2, "-", 0);
     }
 }
 
 #endif