Move remaining SVG properties into CSSPropertyParser

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

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 #include "core/css/parser/CSSPropertyParser.h"
 
 #include "core/StylePropertyShorthand.h"
 #include "core/css/CSSCalculationValue.h"
 #include "core/css/CSSCustomIdentValue.h"
@@ skipping 1934 matching lines @@
     RefPtrWillBeRawPtr<CSSValueList> dashes = CSSValueList::createCommaSeparated();
     do {
         RefPtrWillBeRawPtr<CSSPrimitiveValue> dash = consumeLengthOrPercent(range, SVGAttributeMode, ValueRangeNonNegative, UnitlessQuirk::Allow);
         if (!dash || (consumeCommaIncludingWhitespace(range) && range.atEnd()))
             return nullptr;
         dashes->append(dash.release());
     } while (!range.atEnd());
     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);
     switch (property) {
     case CSSPropertyWillChange:
         return consumeWillChange(m_range);
     case CSSPropertyPage:
         return consumePage(m_range);
     case CSSPropertyQuotes:
         return consumeQuotes(m_range);
@@ skipping 156 matching lines @@
     case CSSPropertyTransform:
         return consumeTransform(m_range, m_context.mode(), unresolvedProperty == CSSPropertyAliasWebkitTransform);
     case CSSPropertyFill:
     case CSSPropertyStroke:
         return consumePaint(m_range, m_context);
     case CSSPropertyPaintOrder:
         return consumePaintOrder(m_range);
     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());
     case CSSPropertyFlexGrow:
     case CSSPropertyFlexShrink:
         return consumeNumber(m_range, ValueRangeNonNegative);
     case CSSPropertyStrokeDasharray:
         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;
     }
 }
 
 static PassRefPtrWillBeRawPtr<CSSValueList> consumeFontFaceUnicodeRange(CSSParserTokenRange& range)
 {
     RefPtrWillBeRawPtr<CSSValueList> values = CSSValueList::createCommaSeparated();
 
     do {
@@ skipping 577 matching lines @@
         return consumeShorthandGreedily(flexFlowShorthand(), important);
     case CSSPropertyWebkitColumnRule:
         return consumeShorthandGreedily(webkitColumnRuleShorthand(), important);
     default:
         m_currentShorthand = oldShorthand;
         return false;
     }
 }
 
 } // namespace blink