Move text-shadow/box-shadow properties into CSSPropertyParser

Move text-shadow/box-shadow properties from
LegacyCSSPropertyParser into CSSPropertyParser.

BUG=499780

Review URL: https://codereview.chromium.org/1419223002

Cr-Commit-Position: refs/heads/master@{#357021}

third_party/WebKit/LayoutTests/animations/interpolation/box-shadow-interpolation.html

@@ -2,7 +2,7 @@
 <meta charset="UTF-8">
 <style>
 .parent {
-  box-shadow: 30px 10px 30px 10px black,
+  box-shadow: 30px 10px 30px 10px black;
 }
 .target {
   display: inline-block;
@@ -13,7 +13,7 @@
   margin-right: 20px;
   margin-bottom: 30px;
   color: green;
-  box-shadow: 10px 30px 10px 30px black,
+  box-shadow: 10px 30px 10px 30px black;
 }
 .expected {
   margin-right: 40px;

third_party/WebKit/LayoutTests/fast/box-shadow/box-shadow-parsing-invalid-expected.txt

@@ -18,6 +18,16 @@ Negative blur radius value, with a negative spread defined : 10px 10px -1px -1px
 PASS cssRule.type is 1
 PASS declaration.length is 0
 PASS declaration.getPropertyValue('box-shadow') is ""
+
+Extraneous commas at beginning : ,,,,,10px 10px rgb(255, 0, 0)
+PASS cssRule.type is 1
+PASS declaration.length is 0
+PASS declaration.getPropertyValue('box-shadow') is ""
+
+Extraneous commas at end : 10px 10px rgb(255, 0, 0),,,,,
+PASS cssRule.type is 1
+PASS declaration.length is 0
+PASS declaration.getPropertyValue('box-shadow') is ""
 PASS successfullyParsed is true
 
 TEST COMPLETE

third_party/WebKit/LayoutTests/fast/box-shadow/script-tests/box-shadow-parsing-invalid.js

@@ -26,5 +26,7 @@ function testInvalidFilterRule(description, rule)
 testInvalidFilterRule("Negative blur radius value", "10px 10px -1px rgb(255, 0, 0)");
 testInvalidFilterRule("Negative blur radius value, with a spread defined", "10px 10px -1px 10px rgb(255, 0, 0)");
 testInvalidFilterRule("Negative blur radius value, with a negative spread defined", "10px 10px -1px -1px rgb(255, 0, 0)");
+testInvalidFilterRule("Extraneous commas at beginning", ",,,,,10px 10px rgb(255, 0, 0)");
+testInvalidFilterRule("Extraneous commas at end", "10px 10px rgb(255, 0, 0),,,,,");
 
 successfullyParsed = true;

third_party/WebKit/Source/core/css/parser/CSSPropertyParser.cpp

@@ -12,6 +12,7 @@
 #include "core/css/CSSFontFeatureValue.h"
 #include "core/css/CSSPrimitiveValueMappings.h"
 #include "core/css/CSSQuadValue.h"
+#include "core/css/CSSShadowValue.h"
 #include "core/css/CSSStringValue.h"
 #include "core/css/CSSTimingFunctionValue.h"
 #include "core/css/CSSURIValue.h"
@@ -1144,13 +1145,6 @@ static PassRefPtrWillBeRawPtr<CSSValue> consumeAnimationIterationCount(CSSParser
     return consumeNumber(range, ValueRangeNonNegative);
 }
 
-static PassRefPtrWillBeRawPtr<CSSValue> consumeZIndex(CSSParserTokenRange& range)
-{
-    if (range.peek().id() == CSSValueAuto)
-        return consumeIdent(range);
-    return consumeInteger(range);
-}
-
 static PassRefPtrWillBeRawPtr<CSSValue> consumeAnimationPlayState(CSSParserTokenRange& range)
 {
     CSSValueID id = range.peek().id();
@@ -1257,7 +1251,6 @@ static PassRefPtrWillBeRawPtr<CSSValue> consumeCubicBezier(CSSParserTokenRange&
     return nullptr;
 }
 
-
 static PassRefPtrWillBeRawPtr<CSSValue> consumeAnimationTimingFunction(CSSParserTokenRange& range)
 {
     CSSValueID id = range.peek().id();
@@ -1385,6 +1378,73 @@ static PassRefPtrWillBeRawPtr<CSSValue> consumeWidowsOrOrphans(CSSParserTokenRan
     return consumePositiveInteger(range);
 }
 
+static PassRefPtrWillBeRawPtr<CSSValue> consumeZIndex(CSSParserTokenRange& range)
+{
+    if (range.peek().id() == CSSValueAuto)
+        return consumeIdent(range);
+    return consumeInteger(range);
+}
+
+static PassRefPtrWillBeRawPtr<CSSShadowValue> parseSingleShadow(CSSParserTokenRange& range, const CSSParserContext& context, bool allowInset, bool allowSpread)
+{
+    RefPtrWillBeRawPtr<CSSPrimitiveValue> style = nullptr;
+    RefPtrWillBeRawPtr<CSSValue> color = nullptr;
+
+    if (range.atEnd())
+        return nullptr;
+    if (range.peek().id() == CSSValueInset) {
+        if (!allowInset)
+            return nullptr;
+        style = consumeIdent(range);
+    }
+    color = consumeColor(range, context);
+
+    RefPtrWillBeRawPtr<CSSPrimitiveValue> horizontalOffset = consumeLength(range, context.mode(), ValueRangeAll);
+    if (!horizontalOffset)
+        return nullptr;
+
+    RefPtrWillBeRawPtr<CSSPrimitiveValue> verticalOffset = consumeLength(range, context.mode(), ValueRangeAll);
+    if (!verticalOffset)
+        return nullptr;
+
+    RefPtrWillBeRawPtr<CSSPrimitiveValue> blurRadius = consumeLength(range, context.mode(), ValueRangeAll);
+    RefPtrWillBeRawPtr<CSSPrimitiveValue> spreadDistance = nullptr;
+    if (blurRadius) {
+        // Blur radius must be non-negative.
+        if (blurRadius->getDoubleValue() < 0)
+            return nullptr;
+        if (allowSpread)
+            spreadDistance = consumeLength(range, context.mode(), ValueRangeAll);
+    }
+
+    if (!range.atEnd()) {
+        if (!color)
+            color = consumeColor(range, context);
+        if (range.peek().id() == CSSValueInset) {
+            if (!allowInset || style)
+                return nullptr;
+            style = consumeIdent(range);
+        }
+    }
+    return CSSShadowValue::create(horizontalOffset.release(), verticalOffset.release(), blurRadius.release(),
+        spreadDistance.release(), style.release(), color.release());
+}
+
+static PassRefPtrWillBeRawPtr<CSSValue> consumeShadow(CSSParserTokenRange& range, const CSSParserContext& context, bool isBoxShadowProperty)
+{
+    if (range.peek().id() == CSSValueNone)
+        return consumeIdent(range);
+
+    RefPtrWillBeRawPtr<CSSValueList> shadowValueList = CSSValueList::createCommaSeparated();
+    do {
+        if (RefPtrWillBeRawPtr<CSSShadowValue> shadowValue = parseSingleShadow(range, context, isBoxShadowProperty, isBoxShadowProperty))
+            shadowValueList->append(shadowValue.release());
+        else
+            return nullptr;
+    } while (consumeCommaIncludingWhitespace(range));
+    return shadowValueList;
+}
+
 PassRefPtrWillBeRawPtr<CSSValue> CSSPropertyParser::parseSingleValue(CSSPropertyID unresolvedProperty)
 {
     CSSPropertyID property = resolveCSSPropertyID(unresolvedProperty);
@@ -1489,6 +1549,9 @@ PassRefPtrWillBeRawPtr<CSSValue> CSSPropertyParser::parseSingleValue(CSSProperty
         return consumeColor(m_range, m_context, inQuirksMode());
     case CSSPropertyZIndex:
         return consumeZIndex(m_range);
+    case CSSPropertyTextShadow: // CSS2 property, dropped in CSS2.1, back in CSS3, so treat as CSS3
+    case CSSPropertyBoxShadow:
+        return consumeShadow(m_range, m_context, property == CSSPropertyBoxShadow);
     default:
         return nullptr;
     }

third_party/WebKit/Source/core/css/parser/CSSPropertyParser.h

@@ -201,7 +201,6 @@ private:
     PassRefPtrWillBeRawPtr<CSSValue> parsePaintOrder() const;
 
     // CSS3 Parsing Routines (for properties specific to CSS3)
-    PassRefPtrWillBeRawPtr<CSSValueList> parseShadow(CSSParserValueList*, CSSPropertyID);
     PassRefPtrWillBeRawPtr<CSSShadowValue> parseSingleShadow(CSSParserValueList*, bool allowInset, bool allowSpread);
     bool parseBorderImageShorthand(CSSPropertyID, bool important);
     PassRefPtrWillBeRawPtr<CSSValue> parseBorderImage(CSSPropertyID);

third_party/WebKit/Source/core/css/parser/LegacyCSSPropertyParser.cpp

@@ -761,13 +761,6 @@ bool CSSPropertyParser::parseValue(CSSPropertyID unresolvedProperty, bool import
     case CSSPropertyOutlineOffset:
         validPrimitive = validUnit(value, FLength);
         break;
-    case CSSPropertyTextShadow: // CSS2 property, dropped in CSS2.1, back in CSS3, so treat as CSS3
-    case CSSPropertyBoxShadow:
-        if (id == CSSValueNone)
-            validPrimitive = true;
-        else
-            parsedValue = parseShadow(m_valueList, propId);
-        break;
     case CSSPropertyWebkitBoxReflect:
         if (id == CSSValueNone)
             validPrimitive = true;
@@ -1230,6 +1223,8 @@ bool CSSPropertyParser::parseValue(CSSPropertyID unresolvedProperty, bool import
     case CSSPropertyWebkitTextFillColor:
     case CSSPropertyColor:
     case CSSPropertyZIndex:
+    case CSSPropertyTextShadow:
+    case CSSPropertyBoxShadow:
         validPrimitive = false;
         break;
 
@@ -3872,22 +3867,6 @@ bool CSSPropertyParser::parseColorFromValue(const CSSParserValue* value, RGBA32&
     return true;
 }
 
-PassRefPtrWillBeRawPtr<CSSValueList> CSSPropertyParser::parseShadow(CSSParserValueList* valueList, CSSPropertyID propID)
-{
-    RefPtrWillBeRawPtr<CSSValueList> shadowValueList = CSSValueList::createCommaSeparated();
-    const bool isBoxShadowProperty = propID == CSSPropertyBoxShadow;
-    while (RefPtrWillBeRawPtr<CSSShadowValue> shadowValue = parseSingleShadow(valueList, isBoxShadowProperty, isBoxShadowProperty)) {
-        shadowValueList->append(shadowValue);
-        if (!valueList->current())
-            break;
-        if (!consumeComma(valueList))
-            return nullptr;
-    }
-    if (shadowValueList->length() == 0)
-        return nullptr;
-    return shadowValueList;
-}
-
 PassRefPtrWillBeRawPtr<CSSShadowValue> CSSPropertyParser::parseSingleShadow(CSSParserValueList* valueList, bool allowInset, bool allowSpread)
 {
     RefPtrWillBeRawPtr<CSSPrimitiveValue> style = nullptr;