Move SVG paint/color properties into CSSPropertyParser

third_party/WebKit/Source/core/css/parser/LegacyCSSPropertyParser.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 1149 matching lines @@
     case CSSPropertyWebkitBorderBeforeWidth:
     case CSSPropertyWebkitBorderAfterWidth:
     case CSSPropertyWebkitBorderStart:
     case CSSPropertyWebkitBorderEnd:
     case CSSPropertyWebkitBorderBefore:
     case CSSPropertyWebkitBorderAfter:
     case CSSPropertyWebkitTextStroke:
     case CSSPropertyWebkitTextStrokeColor:
     case CSSPropertyWebkitTextStrokeWidth:
     case CSSPropertyTransform:
+    case CSSPropertyFill:
+    case CSSPropertyStroke:
+    case CSSPropertyStopColor:
+    case CSSPropertyFloodColor:
+    case CSSPropertyLightingColor:
         validPrimitive = false;
         break;
 
     case CSSPropertyScrollSnapPointsX:
     case CSSPropertyScrollSnapPointsY:
         parsedValue = parseScrollSnapPoints();
         break;
     case CSSPropertyScrollSnapCoordinate:
         parsedValue = parseScrollSnapCoordinate();
         break;
@@ skipping 4309 matching lines @@
     case CSSPropertyFillOpacity:
     case CSSPropertyStopOpacity:
     case CSSPropertyFloodOpacity:
         validPrimitive = validUnit(value, FNumber | FPercent, SVGAttributeMode);
         break;
 
     /* Start of supported CSS properties with validation. This is needed for parseShortHand to work
      * correctly and allows optimization in applyRule(..)
      */
 
-    case CSSPropertyFill: // <paint> | inherit
-    case CSSPropertyStroke: // <paint> | inherit
-        {
-            if (id == CSSValueNone) {
-                parsedValue = cssValuePool().createIdentifierValue(id);
-            } else if (value->m_unit == CSSParserValue::URI) {
-                if (m_valueList->next()) {
-                    RefPtrWillBeRawPtr<CSSValueList> values = CSSValueList::createSpaceSeparated();
-                    values->append(CSSURIValue::create(value->string));
-                    if (m_valueList->current()->id == CSSValueNone)
-                        parsedValue = cssValuePool().createIdentifierValue(m_valueList->current()->id);
-                    else
-                        parsedValue = parseColor(m_valueList->current());
-                    if (parsedValue) {
-                        values->append(parsedValue);
-                        parsedValue = values;
-                    }
-                }
-                if (!parsedValue)
-                    parsedValue = CSSURIValue::create(value->string);
-            } else {
-                parsedValue = parseColor(m_valueList->current());
-            }
-
-            if (parsedValue)
-                m_valueList->next();
-        }
-        break;
-
-    case CSSPropertyStopColor: // TODO : icccolor
-    case CSSPropertyFloodColor:
-    case CSSPropertyLightingColor:
-        parsedValue = parseColor(m_valueList->current());
-        if (parsedValue)
-            m_valueList->next();
-
-        break;
-
     case CSSPropertyPaintOrder:
         if (m_valueList->size() == 1 && id == CSSValueNormal)
             validPrimitive = true;
         else if ((parsedValue = parsePaintOrder()))
             m_valueList->next();
         break;
 
     case CSSPropertyStrokeWidth: // <length> | inherit
     case CSSPropertyStrokeDashoffset:
     case CSSPropertyCx:
@@ skipping 134 matching lines @@
         }
         break;
     default:
         ASSERT_NOT_REACHED();
     }
 
     return paintOrderList.release();
 }
 
 } // namespace blink