Move font-size property handling 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/CSSFontFaceSrcValue.h"
@@ skipping 108 matching lines @@
 
 static CSSParserTokenRange consumeFunction(CSSParserTokenRange& range)
 {
     ASSERT(range.peek().type() == FunctionToken);
     CSSParserTokenRange contents = range.consumeBlock();
     range.consumeWhitespace();
     contents.consumeWhitespace();
     return contents;
 }
 
-class CalcParseScope {
+// TODO(rwlbuis): consider pulling in the parsing logic from CSSCalculationValue.cpp.
+class CalcParser {
     STACK_ALLOCATED();
 
 public:
-    explicit CalcParseScope(CSSParserTokenRange& range, ValueRange valueRange = ValueRangeAll)
+    explicit CalcParser(CSSParserTokenRange& range, ValueRange valueRange = ValueRangeAll)
         : m_sourceRange(range)
         , m_range(range)
     {
         const CSSParserToken& token = range.peek();
         if (token.functionId() == CSSValueCalc || token.functionId() == CSSValueWebkitCalc)
             m_calcValue = CSSCalcValue::create(consumeFunction(m_range), valueRange);
     }
 
     const CSSCalcValue* value() const { return m_calcValue.get(); }

[alancutter (OOO until 2018), 2015/09/30 23:55:37]

I wonder if peekValue() would be a more consistent name with the token range
interface.

-    PassRefPtrWillBeRawPtr<CSSPrimitiveValue> releaseValue()
+    PassRefPtrWillBeRawPtr<CSSPrimitiveValue> consumeValue()
     {
+        if (!m_calcValue)
+            return nullptr;
         m_sourceRange = m_range;
         return CSSPrimitiveValue::create(m_calcValue.release());
     }
-    PassRefPtrWillBeRawPtr<CSSPrimitiveValue> releaseNumber()
+    PassRefPtrWillBeRawPtr<CSSPrimitiveValue> consumeNumber()
     {
+        if (!m_calcValue)
+            return nullptr;
         m_sourceRange = m_range;
         CSSPrimitiveValue::UnitType unitType = m_calcValue->isInt() ? CSSPrimitiveValue::UnitType::Integer : CSSPrimitiveValue::UnitType::Number;
         return cssValuePool().createValue(m_calcValue->doubleValue(), unitType);
     }
 
 private:
     CSSParserTokenRange& m_sourceRange;
     CSSParserTokenRange m_range;
     RefPtrWillBeMember<CSSCalcValue> m_calcValue;
 };
 
 static PassRefPtrWillBeRawPtr<CSSPrimitiveValue> consumeInteger(CSSParserTokenRange& range, CSSParserMode cssParserMode, double minimumValue = std::numeric_limits<int>::min())
 {
     const CSSParserToken& token = range.peek();
     if (token.type() == NumberToken) {
         if (token.numericValueType() == NumberValueType || token.numericValue() < minimumValue)
             return nullptr;
         return cssValuePool().createValue(range.consumeIncludingWhitespace().numericValue(), token.unitType());
     }
-    CalcParseScope calcScope(range);
-    if (const CSSCalcValue* calculation = calcScope.value()) {
+    CalcParser calcParser(range);
+    if (const CSSCalcValue* calculation = calcParser.value()) {
         if (calculation->category() != CalcNumber || !calculation->isInt())
             return nullptr;
         double value = calculation->doubleValue();
         if (value < minimumValue)
             return nullptr;
-        return calcScope.releaseNumber();
+        return calcParser.consumeNumber();
     }
     return nullptr;
 }
 
 inline bool shouldAcceptUnitlessValues(double fValue, CSSParserMode cssParserMode, UnitlessQuirk unitless)
 {
     // Quirks mode for certain properties and presentation attributes accept unit-less values for certain units.
     return !fValue // 0 can always be unitless.
         || isUnitLessLengthParsingEnabledForMode(cssParserMode) // HTML and SVG attribute values can always be unitless.
         || (cssParserMode == HTMLQuirksMode && (unitless == UnitlessQuirk::Allow));
@@ skipping 29 matching lines @@
         if (valueRange == ValueRangeNonNegative && token.numericValue() < 0)
             return nullptr;
         return cssValuePool().createValue(range.consumeIncludingWhitespace().numericValue(), token.unitType());
     }
     if (token.type() == NumberToken) {
         if (!shouldAcceptUnitlessValues(token.numericValue(), cssParserMode, unitless)
             || (valueRange == ValueRangeNonNegative && token.numericValue() < 0))
             return nullptr;
         return cssValuePool().createValue(range.consumeIncludingWhitespace().numericValue(), CSSPrimitiveValue::UnitType::Pixels);
     }
-    CalcParseScope calcScope(range, valueRange);
-    if (const CSSCalcValue* calculation = calcScope.value()) {
+    CalcParser calcParser(range, valueRange);
+    if (const CSSCalcValue* calculation = calcParser.value()) {
         if (calculation->category() != CalcLength)
             return nullptr;
-        return calcScope.releaseValue();
+        return calcParser.consumeValue();
     }

[alancutter (OOO until 2018), 2015/09/30 23:55:37]

if (calcParser.value() && calcParser.value()->category() == CalcLength)
    return calcParser.consumeValue();

     return nullptr;
 }
+
+static PassRefPtrWillBeRawPtr<CSSPrimitiveValue> consumeLengthOrPercent(CSSParserTokenRange& range, CSSParserMode cssParserMode, ValueRange valueRange, UnitlessQuirk unitless = UnitlessQuirk::Forbid)
+{
+    const CSSParserToken& token = range.peek();
+    if (token.type() == DimensionToken || token.type() == NumberToken)
+        return consumeLength(range, cssParserMode, valueRange, unitless);
+    if (token.type() == PercentageToken) {
+        if (valueRange == ValueRangeNonNegative && token.numericValue() < 0)
+            return nullptr;
+        return cssValuePool().createValue(range.consumeIncludingWhitespace().numericValue(), CSSPrimitiveValue::UnitType::Percentage);
+    }
+    CalcParser calcParser(range, valueRange);
+    if (const CSSCalcValue* calculation = calcParser.value()) {
+        if (!(calculation->category() == CalcLength || calculation->category() == CalcPercent || calculation->category() == CalcPercentLength))
+            return nullptr;
+        return calcParser.consumeValue();

[alancutter (OOO until 2018), 2015/09/30 23:55:37]

The negated expression is a bit weird, perhaps unnegate and return
calcParser.consumeValue() instead, then you can fall through to the other return
nullptr.

+    }
+    return nullptr;
+}
 
 static inline bool isCSSWideKeyword(const CSSValueID& id)
 {
     return id == CSSValueInitial || id == CSSValueInherit || id == CSSValueUnset || id == CSSValueDefault;
 }
 
 // Methods for consuming non-shorthand properties starts here.
 static PassRefPtrWillBeRawPtr<CSSValue> consumeWillChange(CSSParserTokenRange& range)
 {
     RefPtrWillBeRawPtr<CSSValueList> values = CSSValueList::createCommaSeparated();
@@ skipping 267 matching lines @@
 }
 
 static PassRefPtrWillBeRawPtr<CSSValue> consumeTabSize(CSSParserTokenRange& range, CSSParserMode cssParserMode)
 {
     RefPtrWillBeRawPtr<CSSPrimitiveValue> parsedValue = consumeInteger(range, cssParserMode, 0);
     if (parsedValue)
         return parsedValue;
     return consumeLength(range, cssParserMode, ValueRangeNonNegative);
 }
 
+static PassRefPtrWillBeRawPtr<CSSValue> consumeFontSize(CSSParserTokenRange& range, CSSParserMode cssParserMode)
+{
+    if (range.peek().id() >= CSSValueXxSmall && range.peek().id() <= CSSValueLarger)
+        return consumeIdent(range);
+    return consumeLengthOrPercent(range, cssParserMode, ValueRangeNonNegative, UnitlessQuirk::Allow);
+}
+
 PassRefPtrWillBeRawPtr<CSSValue> CSSPropertyParser::parseSingleValue(CSSPropertyID propId)
 {
     m_range.consumeWhitespace();
     switch (propId) {
     case CSSPropertyWillChange:
         return consumeWillChange(m_range);
     case CSSPropertyPage:
         return consumePage(m_range);
     case CSSPropertyQuotes:
         return consumeQuotes(m_range);
     case CSSPropertyWebkitHighlight:
         return consumeWebkitHighlight(m_range);
     case CSSPropertyFontVariantLigatures:
         return consumeFontVariantLigatures(m_range);
     case CSSPropertyWebkitFontFeatureSettings:
         return consumeFontFeatureSettings(m_range);
     case CSSPropertyFontVariant:
         return consumeFontVariant();
     case CSSPropertyFontFamily:
         return consumeFontFamily(m_range);
     case CSSPropertyFontWeight:
         return consumeFontWeight(m_range);
     case CSSPropertyLetterSpacing:
     case CSSPropertyWordSpacing:
         return consumeSpacing(m_range, m_context.mode());
     case CSSPropertyTabSize:
         return consumeTabSize(m_range, m_context.mode());
+    case CSSPropertyFontSize:
+        return consumeFontSize(m_range, m_context.mode());
     default:
         return nullptr;
     }
 }
 
 static PassRefPtrWillBeRawPtr<CSSValueList> consumeFontFaceUnicodeRange(CSSParserTokenRange& range)
 {
     RefPtrWillBeRawPtr<CSSValueList> values = CSSValueList::createCommaSeparated();
 
     do {
@@ skipping 152 matching lines @@
         addProperty(CSSPropertyOverflowX, overflowXValue.release(), important);
         addProperty(CSSPropertyOverflowY, overflowYValue.release(), important);
         return true;
     }
     default:
         return false;
     }
 }
 
 } // namespace blink