Remove SVGPaint

Source/core/css/parser/CSSPropertyParser.cpp

 /*
  * Copyright (C) 2003 Lars Knoll (knoll@kde.org)
  * Copyright (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved.
  * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com>
  * Copyright (C) 2008 Eric Seidel <eric@webkit.org>
  * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  * Copyright (C) 2012 Adobe Systems Incorporated. All rights reserved.
  * Copyright (C) 2012 Intel Corporation. All rights reserved.
  *
@@ skipping 49 matching lines @@
 #include "core/css/CSSTimingFunctionValue.h"
 #include "core/css/CSSTransformValue.h"
 #include "core/css/CSSUnicodeRangeValue.h"
 #include "core/css/CSSValueList.h"
 #include "core/css/CSSValuePool.h"
 #include "core/css/Counter.h"
 #include "core/css/HashTools.h"
 #include "core/css/Pair.h"
 #include "core/css/Rect.h"
 #include "core/css/RuntimeCSSEnabled.h"
+#include "core/css/parser/BisonCSSParser.h"
 #include "core/css/parser/CSSParserIdioms.h"
 #include "core/frame/UseCounter.h"
 #include "core/html/parser/HTMLParserIdioms.h"
 #include "core/inspector/InspectorInstrumentation.h"
 #include "core/rendering/RenderTheme.h"
 #include "core/svg/SVGPaint.h"
 #include "platform/FloatConversion.h"
 #include "platform/RuntimeEnabledFeatures.h"
 #include "wtf/BitArray.h"
 #include "wtf/HexNumber.h"
@@ skipping 8121 matching lines @@
             parsedValue = CSSPrimitiveValue::create(value->fValue, CSSPrimitiveValue::CSS_DEG);
 
             if (parsedValue)
                 m_valueList->next();
         }
         break;
 
     case CSSPropertyFill: // <paint> | inherit
     case CSSPropertyStroke: // <paint> | inherit
         {
-            if (id == CSSValueNone) {
-                parsedValue = SVGPaint::createNone();
-            } else if (id == CSSValueCurrentcolor) {
-                parsedValue = SVGPaint::createCurrentColor();
+            if (id == CSSValueNone || id == CSSValueCurrentcolor) {
+                parsedValue = cssValuePool().createIdentifierValue(id);
             } else if (isSystemColor(id)) {
-                parsedValue = SVGPaint::createColor(RenderTheme::theme().systemColor(id));
+                parsedValue = cssValuePool().createColorValue(RenderTheme::theme().systemColor(id).rgb());
             } else if (value->unit == CSSPrimitiveValue::CSS_URI) {
                 RGBA32 c = Color::transparent;
                 if (m_valueList->next()) {
+                    RefPtrWillBeRawPtr<CSSValueList> values = CSSValueList::createSpaceSeparated();
+                    values->append(CSSPrimitiveValue::create(value->string, CSSPrimitiveValue::CSS_URI));
                     if (parseColorFromValue(m_valueList->current(), c))
-                        parsedValue = SVGPaint::createURIAndColor(value->string, c);
+                        parsedValue = cssValuePool().createColorValue(c);
                     else if (m_valueList->current()->id == CSSValueNone)
-                        parsedValue = SVGPaint::createURIAndNone(value->string);
+                        parsedValue = cssValuePool().createIdentifierValue(m_valueList->current()->id);
                     else if (m_valueList->current()->id == CSSValueCurrentcolor)

[krit, 2014/07/01 06:01:55]

You combine none and current color above, why not here? 

IMO, you could always create a space separated list, check for URI or none
first. In the "if", append URI/none to the list, check for m_valueList->next().
If m_valueList->next() false, return  the list (could be just the value as well
in which case the list will be destroyed again). After the "if" for none/URI,
you parse color, system color , currentColor and append it to the list if true.

This way you could avoid all the duplication.

However, the code is correct as it is currently. Just a suggestion to make it
shorter.

-                        parsedValue = SVGPaint::createURIAndCurrentColor(value->string);
+                        parsedValue = cssValuePool().createIdentifierValue(m_valueList->current()->id);
+                    if (parsedValue) {
+                        values->append(parsedValue);
+                        parsedValue = values;
+                    }
                 }
                 if (!parsedValue)
-                    parsedValue = SVGPaint::createURI(value->string);
+                    parsedValue = CSSPrimitiveValue::create(value->string, CSSPrimitiveValue::CSS_URI);
             } else {
-                parsedValue = parseSVGPaint();
+                parsedValue = parseColor();
             }
 
             if (parsedValue)
                 m_valueList->next();
         }
         break;
 
     case CSSPropertyStopColor: // TODO : icccolor
     case CSSPropertyFloodColor:
     case CSSPropertyLightingColor:
         if (isSystemColor(id)) {
             parsedValue = cssValuePool().createColorValue(RenderTheme::theme().systemColor(id).rgb());
         } else if ((id >= CSSValueAqua && id <= CSSValueTransparent)
             || (id >= CSSValueAliceblue && id <= CSSValueYellowgreen) || id == CSSValueGrey) {
-            StyleColor styleColor = SVGPaint::colorFromRGBColorString(value->string);
+            StyleColor styleColor = BisonCSSParser::colorFromRGBColorString(value->string);
             ASSERT(!styleColor.isCurrentColor());
             parsedValue = cssValuePool().createColorValue(styleColor.color().rgb());
         } else if (id == CSSValueCurrentcolor) {
             parsedValue = cssValuePool().createIdentifierValue(id);
         } else { // TODO : svgcolor (iccColor)
             parsedValue = parseColor();
         }
 
         if (parsedValue)
             m_valueList->next();
@@ skipping 106 matching lines @@
             ret->append(CSSPrimitiveValue::create(value->fValue, (CSSPrimitiveValue::UnitType) value->unit));
         value = m_valueList->next();
         if (value && value->unit == CSSParserValue::Operator && value->iValue == ',')
             value = m_valueList->next();
     }
     if (!validPrimitive)
         return nullptr;
     return ret.release();
 }
 
-PassRefPtrWillBeRawPtr<CSSValue> CSSPropertyParser::parseSVGPaint()
-{
-    RGBA32 c = Color::transparent;
-    if (!parseColorFromValue(m_valueList->current(), c))
-        return SVGPaint::createUnknown();
-    return SVGPaint::createColor(Color(c));
-}
-
 // normal | [ fill || stroke || markers ]
 PassRefPtrWillBeRawPtr<CSSValue> CSSPropertyParser::parsePaintOrder() const
 {
     if (m_valueList->size() > 3)
         return nullptr;
 
     CSSParserValue* value = m_valueList->current();
     if (!value)
         return nullptr;
 
@@ skipping 37 matching lines @@
         parsedValues->append(CSSPrimitiveValue::createIdentifier(CSSValueFill));
     if (!seenStroke)
         parsedValues->append(CSSPrimitiveValue::createIdentifier(CSSValueStroke));
     if (!seenMarkers)
         parsedValues->append(CSSPrimitiveValue::createIdentifier(CSSValueMarkers));
 
     return parsedValues.release();
 }
 
 } // namespace WebCore