Add consumeInteger/consumeLength

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

 /*
  * Copyright (C) 2003 Lars Knoll (knoll@kde.org)
  * Copyright (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved.
  * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com>
  * Copyright (C) 2008 Eric Seidel <eric@webkit.org>
  * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  * Copyright (C) 2012 Adobe Systems Incorporated. All rights reserved.
  * Copyright (C) 2012 Intel Corporation. All rights reserved.
  *
@@ skipping 152 matching lines @@
         b = (unitflags & FFrequency);
         break;
     case CalcOther:
         break;
     }
     if (!b || releaseCalc == ReleaseParsedCalcValue)
         m_parsedCalculation.release();
     return b;
 }
 
-inline bool CSSPropertyParser::shouldAcceptUnitLessValues(CSSParserValue* value, Units unitflags, CSSParserMode cssParserMode)
-{
-    // Quirks mode for certain properties and presentation attributes accept unit-less values for certain units.
-    return (unitflags & (FLength | FAngle))
-        && (!value->fValue // 0 can always be unitless.
-            || isUnitLessLengthParsingEnabledForMode(cssParserMode) // HTML and SVG attribute values can always be unitless.
-            || (cssParserMode == HTMLQuirksMode && (unitflags & FUnitlessQuirk)));
-}
-
 inline bool isCalculation(CSSParserValue* value)
 {
     return value->m_unit == CSSParserValue::CalcFunction;
 }
 
 bool CSSPropertyParser::validUnit(CSSParserValue* value, Units unitflags, CSSParserMode cssParserMode, ReleaseParsedCalcValueCondition releaseCalc)
 {
     if (isCalculation(value))
         return validCalculationUnit(value, unitflags, releaseCalc);
 
     if (unitflags & FNonNeg && value->fValue < 0)
         return false;
     switch (value->unit()) {
     case CSSPrimitiveValue::UnitType::Number:
         if (unitflags & FNumber)
             return true;
-        if (shouldAcceptUnitLessValues(value, unitflags, cssParserMode)) {
+        if (shouldAcceptUnitLessValues(value->fValue, unitflags, cssParserMode)) {
             value->setUnit((unitflags & FLength) ? CSSPrimitiveValue::UnitType::Pixels : CSSPrimitiveValue::UnitType::Degrees);
             return true;
         }
         if ((unitflags & FInteger) && value->isInt)
             return true;
         if ((unitflags & FPositiveInteger) && value->isInt && value->fValue > 0)
             return true;
         return false;
     case CSSPrimitiveValue::UnitType::Percentage:
         return unitflags & FPercent;
@@ skipping 475 matching lines @@
     case CSSPropertyWebkitBorderEndWidth:
     case CSSPropertyWebkitBorderBeforeWidth:
     case CSSPropertyWebkitBorderAfterWidth:
     case CSSPropertyWebkitColumnRuleWidth:
         if (id == CSSValueThin || id == CSSValueMedium || id == CSSValueThick)
             validPrimitive = true;
         else
             validPrimitive = validUnit(value, FLength | FNonNeg | unitless);
         break;
 
-    case CSSPropertyLetterSpacing:       // normal | <length> | inherit
-    case CSSPropertyWordSpacing:         // normal | <length> | inherit
-        if (id == CSSValueNormal)
-            validPrimitive = true;
-        else
-            validPrimitive = validUnit(value, FLength | FUnitlessQuirk);
-        break;
-
     case CSSPropertyTextIndent:
         parsedValue = parseTextIndent();
         break;
 
     case CSSPropertyPaddingTop:          //// <padding-width> | inherit
     case CSSPropertyPaddingRight:        //   Which is defined as
     case CSSPropertyPaddingBottom:       //   <length> | <percentage>
     case CSSPropertyPaddingLeft:         ////
         unitless = FUnitlessQuirk;
         // fall through
@@ skipping 193 matching lines @@
                 return false;
             parsedValue2 = createPrimitiveNumericValue(value);
         } else
             parsedValue2 = parsedValue1;
 
         if (m_valueList->next())
             return false;
         addProperty(propId, CSSValuePair::create(parsedValue1.release(), parsedValue2.release(), CSSValuePair::DropIdenticalValues), important);
         return true;
     }
-    case CSSPropertyTabSize:
-        // May be specified as a unit-less non-negative integer or length indicating number of space characters.
-        validPrimitive = validUnit(value, FInteger | FLength | FNonNeg);
-        break;
     case CSSPropertyBorderRadius:
     case CSSPropertyAliasWebkitBorderRadius:
         return parseBorderRadius(unresolvedProperty, important);
     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;
@@ skipping 488 matching lines @@
     case CSSPropertyWillChange:
     case CSSPropertyPage:
     case CSSPropertyOverflow:
     case CSSPropertyQuotes:
     case CSSPropertyWebkitHighlight:
     case CSSPropertyFontVariantLigatures:
     case CSSPropertyWebkitFontFeatureSettings:
     case CSSPropertyFontVariant:
     case CSSPropertyFontFamily:
     case CSSPropertyFontWeight:
+    case CSSPropertyLetterSpacing:
+    case CSSPropertyWordSpacing:
+    case CSSPropertyTabSize:
         validPrimitive = false;
         break;
 
     case CSSPropertyScrollSnapPointsX:
     case CSSPropertyScrollSnapPointsY:
         parsedValue = parseScrollSnapPoints();
         break;
     case CSSPropertyScrollSnapCoordinate:
         parsedValue = parseScrollSnapCoordinate();
         break;
@@ skipping 6038 matching lines @@
         }
     }
 
     if (!list->length())
         return nullptr;
 
     return list.release();
 }
 
 } // namespace blink