Move isValid/isCurrentColor from Color to StyleColor

Source/core/css/resolver/StyleBuilderCustom.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com)
  * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com)
  * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved.
  * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
  * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org>
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  * Copyright (c) 2011, Code Aurora Forum. All rights reserved.
@@ skipping 991 matching lines @@
         return true;
     }
     if (angle > 135.0f && angle <= 225.0f) {
         orientation = GO_180DEG;
         return true;
     }
     orientation = GO_270DEG;
     return true;
 }
 
-static Color colorFromSVGColorCSSValue(SVGColor* svgColor, const Color& fgColor)
+static Color colorFromSVGColorCSSValue(SVGColor* svgColor, const StyleColor& fgColor)
 {
     Color color;
     if (svgColor->colorType() == SVGColor::SVG_COLORTYPE_CURRENTCOLOR)
-        color = fgColor;
+        color = fgColor.color();
     else
         color = svgColor->color();
     return color;
 }
 
 static bool numberToFloat(const CSSPrimitiveValue* primitiveValue, float& out)
 {
     if (!primitiveValue)
         return false;
     if (primitiveValue->primitiveType() != CSSPrimitiveValue::CSS_NUMBER)
@@ skipping 45 matching lines @@
             }
 
             if (!value->isValueList())
                 return;
 
             bool didSet = false;
             for (CSSValueListIterator i = value; i.hasMore(); i.advance()) {
                 CSSValue* item = i.value();
                 if (item->isImageGeneratorValue()) {
                     if (item->isGradientValue())
-                        state.style()->setContent(StyleGeneratedImage::create(static_cast<CSSGradientValue*>(item)->gradientWithStylesResolved(state.document()->textLinkColors(), state.style()->color()).get()), didSet);
+                        state.style()->setContent(StyleGeneratedImage::create(static_cast<CSSGradientValue*>(item)->gradientWithStylesResolved(state.document()->textLinkColors()).get()), didSet);
                     else
                         state.style()->setContent(StyleGeneratedImage::create(static_cast<CSSImageGeneratorValue*>(item)), didSet);
                     didSet = true;
                 } else if (item->isImageSetValue()) {
                     state.style()->setContent(state.elementStyleResources().setOrPendingFromValue(CSSPropertyContent, static_cast<CSSImageSetValue*>(item)), didSet);
                     didSet = true;
                 }
 
                 if (item->isImageValue()) {
                     state.style()->setContent(state.elementStyleResources().cachedOrPendingFromValue(CSSPropertyContent, toCSSImageValue(item)), didSet);
@@ skipping 159 matching lines @@
         for (CSSValueListIterator i = value; i.hasMore(); i.advance()) {
             CSSValue* currValue = i.value();
             if (!currValue->isShadowValue())
                 continue;
             ShadowValue* item = static_cast<ShadowValue*>(currValue);
             int x = item->x->computeLength<int>(state.style(), state.rootElementStyle(), zoomFactor);
             int y = item->y->computeLength<int>(state.style(), state.rootElementStyle(), zoomFactor);
             int blur = item->blur ? item->blur->computeLength<int>(state.style(), state.rootElementStyle(), zoomFactor) : 0;
             int spread = item->spread ? item->spread->computeLength<int>(state.style(), state.rootElementStyle(), zoomFactor) : 0;
             ShadowStyle shadowStyle = item->style && item->style->getValueID() == CSSValueInset ? Inset : Normal;
-            Color color;
+            StyleColor color;
             if (item->color)
-                color = state.document()->textLinkColors().colorFromPrimitiveValue(item->color.get(), state.style()->visitedDependentColor(CSSPropertyColor));
+                color = state.document()->textLinkColors().colorFromPrimitiveValue(item->color.get());
             else if (state.style())
                 color = state.style()->color();
 
             if (!color.isValid())
                 color = Color::transparent;
             OwnPtr<ShadowData> shadow = ShadowData::create(IntPoint(x, y), blur, spread, shadowStyle, color);
             if (id == CSSPropertyTextShadow)
                 state.style()->setTextShadow(shadow.release(), i.index()); // add to the list if this is not the first entry
             else
                 state.style()->setBoxShadow(shadow.release(), i.index()); // add to the list if this is not the first entry
@@ skipping 97 matching lines @@
 
         if (perspectiveValue >= 0.0f)
             state.style()->setPerspective(perspectiveValue);
         return;
     }
     case CSSPropertyWebkitTapHighlightColor: {
         HANDLE_INHERIT_AND_INITIAL(tapHighlightColor, TapHighlightColor);
         if (!primitiveValue)
             break;
 
-        Color col = state.document()->textLinkColors().colorFromPrimitiveValue(primitiveValue, state.style()->visitedDependentColor(CSSPropertyColor));
+        StyleColor col = state.document()->textLinkColors().colorFromPrimitiveValue(primitiveValue);
         state.style()->setTapHighlightColor(col);
         return;
     }
     case CSSPropertyInvalid:
         return;
     // Directional properties are resolved by resolveDirectionAwareProperty() before the switch.
     case CSSPropertyWebkitBorderEndColor:
     case CSSPropertyWebkitBorderEndStyle:
     case CSSPropertyWebkitBorderEndWidth:
     case CSSPropertyWebkitBorderStartColor:
@@ skipping 790 matching lines @@
         if (!list->length())
             return;
 
         CSSValue* firstValue = list->itemWithoutBoundsCheck(0);
         if (!firstValue->isShadowValue())
             return;
         ShadowValue* item = static_cast<ShadowValue*>(firstValue);
         IntPoint location(item->x->computeLength<int>(state.style(), state.rootElementStyle()),
             item->y->computeLength<int>(state.style(), state.rootElementStyle()));
         int blur = item->blur ? item->blur->computeLength<int>(state.style(), state.rootElementStyle()) : 0;
-        Color color;
+        StyleColor color;
         if (item->color)
-            color = state.document()->textLinkColors().colorFromPrimitiveValue(item->color.get(), state.style()->visitedDependentColor(CSSPropertyColor));
+            color = state.document()->textLinkColors().colorFromPrimitiveValue(item->color.get());
 
         // -webkit-svg-shadow does should not have a spread or style
         ASSERT(!item->spread);
         ASSERT(!item->style);
 
         if (!color.isValid())
             color = Color::transparent;
         state.style()->accessSVGStyle()->setShadow(ShadowData::create(location, blur, 0, Normal, color));
         return;
     }
@@ skipping 12 matching lines @@
     case CSSPropertyMaskType: {
         HANDLE_SVG_INHERIT_AND_INITIAL(maskType, MaskType)
         if (primitiveValue)
             state.style()->accessSVGStyle()->setMaskType(*primitiveValue);
         break;
     }
     }
 }
 
 } // namespace WebCore