Move remaining SVG properties into CSSPropertyParser

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

Index: third_party/WebKit/Source/core/css/parser/CSSPropertyParser.cpp
diff --git a/third_party/WebKit/Source/core/css/parser/CSSPropertyParser.cpp b/third_party/WebKit/Source/core/css/parser/CSSPropertyParser.cpp
index 1a6cf290c7ff6ab745a5886f8603c906cc69012d..199b93e0eac4fd653eb392aef27882f9d4386f49 100644
--- a/third_party/WebKit/Source/core/css/parser/CSSPropertyParser.cpp
+++ b/third_party/WebKit/Source/core/css/parser/CSSPropertyParser.cpp
@@ -1952,6 +1952,22 @@ static PassRefPtrWillBeRawPtr<CSSValue> consumeStrokeDasharray(CSSParserTokenRan
     return dashes.release();
 }
 
+static PassRefPtrWillBeRawPtr<CSSPrimitiveValue> consumeOpacity(CSSParserTokenRange& range)

[Timothy Loh, 2015/11/30 06:09:57]

consumeSVGOpacity since opacity isn't going to call into here.

[fs, 2015/11/30 09:52:59]

They really should be the same though (according to new and old spec AFAICS).
Maybe something to add a use-counter for and try to fix...

[rwlbuis, 2015/11/30 22:17:43]

The plot thickens. The only difference I saw was that stroke-opacity etc.
accepted percentages. But I don't see anything about this in the specs! So I
removed support for this in the latest patch, then we can just call
consumeNumber, and it is really the same as opacity.

[fs, 2015/11/30 23:10:31]

SGTM to remove if <other browser> passes the new test.

+{
+    RefPtrWillBeRawPtr<CSSPrimitiveValue> opacity = consumePercent(range, ValueRangeAll);
+    if (opacity)
+        return opacity;

[Timothy Loh, 2015/11/30 06:09:57]

opacity.release();

[rwlbuis, 2015/11/30 22:17:43]

Correct, however we may not need it.

+    return consumeNumber(range, ValueRangeAll);
+}
+
+static PassRefPtrWillBeRawPtr<CSSPrimitiveValue> consumeBaselineShift(CSSParserTokenRange& range)
+{
+    CSSValueID id = range.peek().id();
+    if (id == CSSValueBaseline || id == CSSValueSub || id == CSSValueSuper)
+        return consumeIdent(range);
+    return consumeLengthOrPercent(range, SVGAttributeMode, ValueRangeAll, UnitlessQuirk::Allow);

[Timothy Loh, 2015/11/30 06:09:57]

Should be UnitlessQuirk::Forbid. SVGAttributeMode handles the
unitless->UserUnits case, while UnitLessQuirk::Allow should be only for the
actual unitless length quirk as per spec.

https://quirks.spec.whatwg.org/#the-unitless-length-quirk

[rwlbuis, 2015/11/30 22:17:43]

Done.

+}
+
 PassRefPtrWillBeRawPtr<CSSValue> CSSPropertyParser::parseSingleValue(CSSPropertyID unresolvedProperty)
 {
     CSSPropertyID property = resolveCSSPropertyID(unresolvedProperty);
@@ -2128,6 +2144,9 @@ PassRefPtrWillBeRawPtr<CSSValue> CSSPropertyParser::parseSingleValue(CSSProperty
     case CSSPropertyMarkerStart:
     case CSSPropertyMarkerMid:
     case CSSPropertyMarkerEnd:
+    case CSSPropertyClipPath:
+    case CSSPropertyFilter:
+    case CSSPropertyMask:
         return consumeNoneOrURI(m_range);
     case CSSPropertyFlexBasis:
         return consumeFlexBasis(m_range, m_context.mode());
@@ -2138,6 +2157,25 @@ PassRefPtrWillBeRawPtr<CSSValue> CSSPropertyParser::parseSingleValue(CSSProperty
         return consumeStrokeDasharray(m_range);
     case CSSPropertyWebkitColumnRuleWidth:
         return consumeColumnRuleWidth(m_range, m_context.mode());
+    case CSSPropertyStrokeOpacity:
+    case CSSPropertyFillOpacity:
+    case CSSPropertyStopOpacity:
+    case CSSPropertyFloodOpacity:
+        return consumeOpacity(m_range);
+    case CSSPropertyBaselineShift:
+        return consumeBaselineShift(m_range);
+    case CSSPropertyStrokeMiterlimit:
+        return consumeNumber(m_range, ValueRangeNonNegative);
+    case CSSPropertyStrokeWidth:
+    case CSSPropertyStrokeDashoffset:
+    case CSSPropertyCx:
+    case CSSPropertyCy:
+    case CSSPropertyX:
+    case CSSPropertyY:
+    case CSSPropertyR:
+    case CSSPropertyRx:
+    case CSSPropertyRy:
+        return consumeLengthOrPercent(m_range, SVGAttributeMode, ValueRangeAll, UnitlessQuirk::Allow);

[Timothy Loh, 2015/11/30 06:09:57]

::Forbid

[rwlbuis, 2015/11/30 22:17:43]

Done.

     default:
         return nullptr;
     }