Remove SVGPaint

Source/core/css/SVGCSSComputedStyleDeclaration.cpp

 /*
     Copyright (C) 2007 Eric Seidel <eric@webkit.org>
     Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
     License as published by the Free Software Foundation; either
     version 2 of the License, or (at your option) any later version.
 
     This library is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     Library General Public License for more details.
 
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
     Boston, MA 02110-1301, USA.
  */
 
 #include "config.h"
 
 #include "core/css/CSSComputedStyleDeclaration.h"
 
 #include "core/CSSPropertyNames.h"
 #include "core/css/CSSPrimitiveValueMappings.h"
 #include "core/dom/Document.h"
 #include "core/rendering/style/RenderStyle.h"
-#include "core/svg/SVGPaint.h"
 
 namespace WebCore {
 
 static PassRefPtrWillBeRawPtr<CSSPrimitiveValue> glyphOrientationToCSSPrimitiveValue(EGlyphOrientation orientation)
 {
     switch (orientation) {
         case GO_0DEG:
             return CSSPrimitiveValue::create(0.0f, CSSPrimitiveValue::CSS_DEG);
         case GO_90DEG:
             return CSSPrimitiveValue::create(90.0f, CSSPrimitiveValue::CSS_DEG);
@@ skipping 36 matching lines @@
         case PT_NONE:
         default:
             ASSERT_NOT_REACHED();
             break;
         }
     } while (paintorder >>= kPaintOrderBitwidth);
 
     return list.release();
 }
 
-PassRefPtrWillBeRawPtr<SVGPaint> CSSComputedStyleDeclaration::adjustSVGPaintForCurrentColor(PassRefPtrWillBeRawPtr<SVGPaint> newPaint, RenderStyle& style) const
+static PassRefPtrWillBeRawPtr<CSSValue> adjustSVGPaintForCurrentColor(SVGPaintType paintType, const String& url, const Color& color, const Color& currentColor)
 {
-    RefPtrWillBeRawPtr<SVGPaint> paint = newPaint;
-    if (paint->paintType() == SVGPaint::SVG_PAINTTYPE_CURRENTCOLOR || paint->paintType() == SVGPaint::SVG_PAINTTYPE_URI_CURRENTCOLOR)
-        paint->setColor(style.color());
-    return paint.release();
+    if (paintType >= SVG_PAINTTYPE_URI_NONE) {
+        RefPtrWillBeRawPtr<CSSValueList> values = CSSValueList::createSpaceSeparated();
+        values->append(CSSPrimitiveValue::create(url, CSSPrimitiveValue::CSS_URI));
+        if (paintType == SVG_PAINTTYPE_URI_NONE)
+            values->append(CSSPrimitiveValue::create(CSSValueNone));
+        else if (paintType == SVG_PAINTTYPE_URI_CURRENTCOLOR)
+            values->append(CSSPrimitiveValue::createColor(currentColor.rgb()));
+        else if (paintType == SVG_PAINTTYPE_URI_RGBCOLOR)
+            values->append(CSSPrimitiveValue::createColor(color.rgb()));
+        return values.release();
+    }
+    if (paintType == SVG_PAINTTYPE_NONE)
+        return CSSPrimitiveValue::create(CSSValueNone);
+    if (paintType == SVG_PAINTTYPE_CURRENTCOLOR)
+        return CSSPrimitiveValue::createColor(currentColor.rgb());
+
+    return CSSPrimitiveValue::createColor(color.rgb());
 }
 
 static inline String serializeAsFragmentIdentifier(const AtomicString& resource)
 {
     return "#" + resource;
 }
 
 PassRefPtrWillBeRawPtr<CSSValue> CSSComputedStyleDeclaration::getSVGPropertyCSSValue(CSSPropertyID propertyID, EUpdateLayout updateLayout) const
 {
     Node* node = m_node.get();
@@ skipping 59 matching lines @@
             if (!svgStyle->filterResource().isEmpty())
                 return CSSPrimitiveValue::create(serializeAsFragmentIdentifier(svgStyle->filterResource()), CSSPrimitiveValue::CSS_URI);
             return CSSPrimitiveValue::createIdentifier(CSSValueNone);
         case CSSPropertyFloodColor:
             return currentColorOrValidColor(*style, svgStyle->floodColor());
         case CSSPropertyLightingColor:
             return currentColorOrValidColor(*style, svgStyle->lightingColor());
         case CSSPropertyStopColor:
             return currentColorOrValidColor(*style, svgStyle->stopColor());
         case CSSPropertyFill:
-            return adjustSVGPaintForCurrentColor(SVGPaint::create(svgStyle->fillPaintType(), svgStyle->fillPaintUri(), svgStyle->fillPaintColor()), *style);
+            return adjustSVGPaintForCurrentColor(svgStyle->fillPaintType(), svgStyle->fillPaintUri(), svgStyle->fillPaintColor(), style->color());
         case CSSPropertyMarkerEnd:
             if (!svgStyle->markerEndResource().isEmpty())
                 return CSSPrimitiveValue::create(serializeAsFragmentIdentifier(svgStyle->markerEndResource()), CSSPrimitiveValue::CSS_URI);
             return CSSPrimitiveValue::createIdentifier(CSSValueNone);
         case CSSPropertyMarkerMid:
             if (!svgStyle->markerMidResource().isEmpty())
                 return CSSPrimitiveValue::create(serializeAsFragmentIdentifier(svgStyle->markerMidResource()), CSSPrimitiveValue::CSS_URI);
             return CSSPrimitiveValue::createIdentifier(CSSValueNone);
         case CSSPropertyMarkerStart:
             if (!svgStyle->markerStartResource().isEmpty())
                 return CSSPrimitiveValue::create(serializeAsFragmentIdentifier(svgStyle->markerStartResource()), CSSPrimitiveValue::CSS_URI);
             return CSSPrimitiveValue::createIdentifier(CSSValueNone);
         case CSSPropertyStroke:
-            return adjustSVGPaintForCurrentColor(SVGPaint::create(svgStyle->strokePaintType(), svgStyle->strokePaintUri(), svgStyle->strokePaintColor()), *style);
+            return adjustSVGPaintForCurrentColor(svgStyle->strokePaintType(), svgStyle->strokePaintUri(), svgStyle->strokePaintColor(), style->color());
         case CSSPropertyStrokeDasharray:
             return strokeDashArrayToCSSValueList(svgStyle->strokeDashArray());
         case CSSPropertyStrokeDashoffset:
             return SVGLength::toCSSPrimitiveValue(svgStyle->strokeDashOffset());
         case CSSPropertyStrokeWidth:
             return SVGLength::toCSSPrimitiveValue(svgStyle->strokeWidth());
         case CSSPropertyBaselineShift: {
             switch (svgStyle->baselineShift()) {
                 case BS_BASELINE:
                     return CSSPrimitiveValue::createIdentifier(CSSValueBaseline);
@@ skipping 33 matching lines @@
     default:
         // If you crash here, it's because you added a css property and are not handling it
         // in either this switch statement or the one in CSSComputedStyleDelcaration::getPropertyCSSValue
         ASSERT_WITH_MESSAGE(0, "unimplemented propertyID: %d", propertyID);
     }
     WTF_LOG_ERROR("unimplemented propertyID: %d", propertyID);
     return nullptr;
 }
 
 }