Added CSSPropertyCounterUtils which holds shared counter parsing logic.

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 "core/css/parser/CSSPropertyParser.h"
 
 #include <memory>
 #include "core/StylePropertyShorthand.h"
 #include "core/css/CSSBasicShapeValues.h"
 #include "core/css/CSSBorderImage.h"
@@ skipping 25 matching lines @@
 #include "core/css/HashTools.h"
 #include "core/css/parser/CSSParserFastPaths.h"
 #include "core/css/parser/CSSParserIdioms.h"
 #include "core/css/parser/CSSPropertyParserHelpers.h"
 #include "core/css/parser/CSSVariableParser.h"
 #include "core/css/parser/FontVariantLigaturesParser.h"
 #include "core/css/parser/FontVariantNumericParser.h"
 #include "core/css/properties/CSSPropertyAPI.h"
 #include "core/css/properties/CSSPropertyAlignmentUtils.h"
 #include "core/css/properties/CSSPropertyColumnUtils.h"
+#include "core/css/properties/CSSPropertyCounterUtils.h"
 #include "core/css/properties/CSSPropertyDescriptor.h"
 #include "core/css/properties/CSSPropertyFontUtils.h"
 #include "core/css/properties/CSSPropertyLengthUtils.h"
 #include "core/css/properties/CSSPropertyMarginUtils.h"
 #include "core/css/properties/CSSPropertyPositionUtils.h"
 #include "core/css/properties/CSSPropertyShapeUtils.h"
 #include "core/frame/UseCounter.h"
 #include "core/layout/LayoutTheme.h"
 #include "core/svg/SVGPathUtilities.h"
 #include "wtf/text/StringBuilder.h"
@@ skipping 252 matching lines @@
     if (fontVariant)
       values->append(*fontVariant);
   } while (consumeCommaIncludingWhitespace(range));
 
   if (values->length())
     return values;
 
   return nullptr;
 }
 
-static CSSValue* consumeCounter(CSSParserTokenRange& range, int defaultValue) {
-  if (range.peek().id() == CSSValueNone)
-    return consumeIdent(range);
-
-  CSSValueList* list = CSSValueList::createSpaceSeparated();
-  do {
-    CSSCustomIdentValue* counterName = consumeCustomIdent(range);
-    if (!counterName)
-      return nullptr;
-    int i = defaultValue;
-    if (CSSPrimitiveValue* counterValue = consumeInteger(range))
-      i = clampTo<int>(counterValue->getDoubleValue());
-    list->append(*CSSValuePair::create(
-        counterName,
-        CSSPrimitiveValue::create(i, CSSPrimitiveValue::UnitType::Integer),
-        CSSValuePair::DropIdenticalValues));
-  } while (!range.atEnd());
-  return list;
-}
-
 static CSSValue* consumeLocale(CSSParserTokenRange& range) {
   if (range.peek().id() == CSSValueAuto)
     return consumeIdent(range);
   return consumeString(range);
 }
 
 static CSSValue* consumeAnimationIterationCount(CSSParserTokenRange& range) {
   if (range.peek().id() == CSSValueInfinite)
     return consumeIdent(range);
   return consumeNumber(range, ValueRangeNonNegative);
@@ skipping 1509 matching lines @@
       CSSPropertyDescriptor::get(property);
   if (cssPropertyDesc.parseSingleValue)
     return cssPropertyDesc.parseSingleValue(m_range, m_context);
 
   switch (property) {
     case CSSPropertyFontFeatureSettings:
       return CSSPropertyFontUtils::consumeFontFeatureSettings(m_range);
     case CSSPropertyFontWeight:
       return CSSPropertyFontUtils::consumeFontWeight(m_range);
     case CSSPropertyCounterIncrement:
-      return consumeCounter(m_range, 1);
+      return CSSPropertyCounterUtils::consumeCounter(
+          m_range, CSSPropertyCounterUtils::kIncrementDefaultValue);
     case CSSPropertyCounterReset:
-      return consumeCounter(m_range, 0);
+      return CSSPropertyCounterUtils::consumeCounter(
+          m_range, CSSPropertyCounterUtils::kResetDefaultValue);
     case CSSPropertyMaxWidth:
     case CSSPropertyMaxHeight:
       return CSSPropertyLengthUtils::consumeMaxWidthOrHeight(
           m_range, m_context, UnitlessQuirk::Allow);
     case CSSPropertyMinWidth:
     case CSSPropertyMinHeight:
     case CSSPropertyWidth:
     case CSSPropertyHeight:
       return CSSPropertyLengthUtils::consumeWidthOrHeight(m_range, m_context,
                                                           UnitlessQuirk::Allow);
@@ skipping 1722 matching lines @@
     case CSSPropertyGrid:
       return consumeGridShorthand(important);
     case CSSPropertyPlaceContent:
       return consumePlaceContentShorthand(important);
     default:
       return false;
   }
 }
 
 }  // namespace blink