Move content property 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/CSSCounterValue.h"
 #include "core/css/CSSCrossfadeValue.h"
 #include "core/css/CSSCursorImageValue.h"
 #include "core/css/CSSCustomIdentValue.h"
 #include "core/css/CSSFontFaceSrcValue.h"
 #include "core/css/CSSFontFeatureValue.h"
 #include "core/css/CSSFunctionValue.h"
 #include "core/css/CSSImageSetValue.h"
 #include "core/css/CSSPathValue.h"
 #include "core/css/CSSPrimitiveValueMappings.h"
 #include "core/css/CSSQuadValue.h"
@@ skipping 2590 matching lines @@
     if (range.peek().type() == FunctionToken) {
         CSSValueID id = range.peek().functionId();
         if (id == CSSValueWebkitImageSet)
             return consumeImageSet(range, context);
         if (CSSPropertyParser::isGeneratedImage(id))
             return consumeGeneratedImage(range, context);
     }
     return nullptr;
 }
 
+static PassRefPtrWillBeRawPtr<CSSValue> consumeAttr(CSSParserTokenRange args, CSSParserContext context)
+{
+    if (args.peek().type() != IdentToken)
+        return nullptr;
+
+    String attrName = args.consumeIncludingWhitespace().value();
+    // CSS allows identifiers with "-" at the start, like "-webkit-mask-image".
+    // But HTML attribute names can't have those characters, and we should not

[Timothy Loh, 2015/12/15 04:44:54]

This comment seems wrong. The HTML spec doesn't seem to reject "-", and this
isn't mentioned anywhere. Firefox seems to allow any valid ident.
http://www.w3.org/TR/html5/syntax.html#attributes-0
http://www.w3.org/TR/CSS2/generate.html#x18

Maybe a TODO instead?
// TODO(timloh): We should allow any <ident-token> here.

+    // even parse them inside attr().
+    if (attrName[0] == '-' || !args.atEnd())
+        return nullptr;
+
+    if (context.isHTMLDocument())
+        attrName = attrName.lower();
+
+    RefPtrWillBeRawPtr<CSSFunctionValue> attrValue = CSSFunctionValue::create(CSSValueAttr);
+    attrValue->append(CSSCustomIdentValue::create(attrName));
+    return attrValue.release();
+}
+
+static PassRefPtrWillBeRawPtr<CSSValue> consumeCounterContent(CSSParserTokenRange args, bool counters)
+{
+    RefPtrWillBeRawPtr<CSSCustomIdentValue> identifier = consumeCustomIdent(args);
+    if (!identifier)
+        return nullptr;
+
+    RefPtrWillBeRawPtr<CSSCustomIdentValue> separator = nullptr;

[Timothy Loh, 2015/12/15 04:44:54]

I guess I'll take a TODO here...

// TODO(timloh): Make this a CSSStringValue.

+    if (!counters) {
+        separator = CSSCustomIdentValue::create(String());
+    } else {
+        if (!consumeCommaIncludingWhitespace(args))
+            return nullptr;
+        if (args.peek().type() != StringToken)
+            return nullptr;
+        separator = CSSCustomIdentValue::create(args.consumeIncludingWhitespace().value());
+    }
+
+    RefPtrWillBeRawPtr<CSSPrimitiveValue> listStyle = nullptr;
+    if (args.atEnd()) { // Make the list style default decimal

[Timothy Loh, 2015/12/15 04:44:54]

How about (one less args.atEnd(), longest line isn't quite so long, not manually
creating ident for non-default case):

if (consumeComma..(args)) {
    CSSValueID id = args.peek().id();
    if (...)
        return nullptr;
    listStyle = consumeIdent(args);
} else {
    listStyle = ...(CSSValueDecimal);
}

if (!args.atEnd())
    return nullptr;
return ...

+        listStyle = cssValuePool().createIdentifierValue(CSSValueDecimal);
+    } else {
+        if (!consumeCommaIncludingWhitespace(args))
+            return nullptr;
+        CSSValueID id = args.consumeIncludingWhitespace().id();
+        if ((id != CSSValueNone && (id < CSSValueDisc || id > CSSValueKatakanaIroha)) || !args.atEnd())
+            return nullptr;
+        listStyle = cssValuePool().createIdentifierValue(id);
+    }
+
+    return CSSCounterValue::create(identifier.release(), listStyle.release(), separator.release());
+}
+
+static PassRefPtrWillBeRawPtr<CSSValueList> consumeContent(CSSParserTokenRange& range, CSSParserContext context)
+{
+    RefPtrWillBeRawPtr<CSSValueList> values = CSSValueList::createSpaceSeparated();
+
+    do {
+        RefPtrWillBeRawPtr<CSSValue> parsedValue = consumeImage(range, context);
+        if (!parsedValue) {
+            parsedValue = consumeIdent<CSSValueOpenQuote, CSSValueCloseQuote, CSSValueNoOpenQuote, CSSValueNoCloseQuote, CSSValueNormal>(range);
+            if (!parsedValue)

[Timothy Loh, 2015/12/15 04:44:54]

I think it'd look nicer if these weren't nested -- might be a few extra cycles
but it shouldn't matter.

+                parsedValue = consumeString(range);
+            if (!parsedValue) {
+                if (range.peek().type() == FunctionToken) {
+                    if (range.peek().functionId() == CSSValueAttr)
+                        parsedValue = consumeAttr(consumeFunction(range), context);
+                    else if (range.peek().functionId() == CSSValueCounter)
+                        parsedValue = consumeCounterContent(consumeFunction(range), false);
+                    else if (range.peek().functionId() == CSSValueCounters)
+                        parsedValue = consumeCounterContent(consumeFunction(range), true);
+                }
+                if (!parsedValue)
+                    return nullptr;
+            }
+        }
+        values->append(parsedValue.release());
+    } while (!range.atEnd());
+
+    return values.release();
+}
+
 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 219 matching lines @@
     case CSSPropertyR:
     case CSSPropertyRx:
     case CSSPropertyRy:
         return consumeLengthOrPercent(m_range, SVGAttributeMode, ValueRangeAll, UnitlessQuirk::Forbid);
     case CSSPropertyCursor:
         return consumeCursor(m_range, m_context, inQuirksMode());
     case CSSPropertyContain:
         return consumeContain(m_range);
     case CSSPropertyTransformOrigin:
         return consumeTransformOrigin(m_range, m_context.mode(), UnitlessQuirk::Forbid);
+    case CSSPropertyContent:
+        return consumeContent(m_range, m_context);
     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