CSS: Use count unitless 0 supplied as <angle>

third_party/WebKit/Source/core/css/properties/CSSPropertyAPITransform.cpp

Index: third_party/WebKit/Source/core/css/properties/CSSPropertyAPITransform.cpp
diff --git a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPITransform.cpp b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPITransform.cpp
index 712a4a4c987055e3b8026bc94b99edaa29332699..4a14c21d9fa4223f2809cfaab70153e5a6be723b 100644
--- a/third_party/WebKit/Source/core/css/properties/CSSPropertyAPITransform.cpp
+++ b/third_party/WebKit/Source/core/css/properties/CSSPropertyAPITransform.cpp
@@ -12,19 +12,19 @@
 
 namespace blink {
 
+using namespace CSSPropertyParserHelpers;
+
 namespace {
 
 bool ConsumeNumbers(CSSParserTokenRange& args,
                     CSSFunctionValue*& transform_value,
                     unsigned number_of_arguments) {
   do {
-    CSSValue* parsed_value =
-        CSSPropertyParserHelpers::ConsumeNumber(args, kValueRangeAll);
+    CSSValue* parsed_value = ConsumeNumber(args, kValueRangeAll);
     if (!parsed_value)
       return false;
     transform_value->Append(*parsed_value);
-    if (--number_of_arguments &&
-        !CSSPropertyParserHelpers::ConsumeCommaIncludingWhitespace(args)) {
+    if (--number_of_arguments && !ConsumeCommaIncludingWhitespace(args)) {
       return false;
     }
   } while (number_of_arguments);
@@ -35,12 +35,11 @@ bool ConsumePerspective(CSSParserTokenRange& args,
                         const CSSParserContext* context,
                         CSSFunctionValue*& transform_value,
                         bool use_legacy_parsing) {
-  CSSPrimitiveValue* parsed_value = CSSPropertyParserHelpers::ConsumeLength(
-      args, context->Mode(), kValueRangeNonNegative);
+  CSSPrimitiveValue* parsed_value =
+      ConsumeLength(args, context->Mode(), kValueRangeNonNegative);
   if (!parsed_value && use_legacy_parsing) {
     double perspective;
-    if (!CSSPropertyParserHelpers::ConsumeNumberRaw(args, perspective) ||
-        perspective < 0) {
+    if (!ConsumeNumberRaw(args, perspective) || perspective < 0) {
       return false;
     }
     context->Count(UseCounter::kUnitlessPerspectiveInTransformProperty);
@@ -59,16 +58,15 @@ bool ConsumeTranslate3d(CSSParserTokenRange& args,
   unsigned number_of_arguments = 2;
   CSSValue* parsed_value = nullptr;
   do {
-    parsed_value = CSSPropertyParserHelpers::ConsumeLengthOrPercent(
-        args, css_parser_mode, kValueRangeAll);
+    parsed_value =
+        ConsumeLengthOrPercent(args, css_parser_mode, kValueRangeAll);
     if (!parsed_value)
       return false;
     transform_value->Append(*parsed_value);
-    if (!CSSPropertyParserHelpers::ConsumeCommaIncludingWhitespace(args))
+    if (!ConsumeCommaIncludingWhitespace(args))
       return false;
   } while (--number_of_arguments);
-  parsed_value = CSSPropertyParserHelpers::ConsumeLength(args, css_parser_mode,
-                                                         kValueRangeAll);
+  parsed_value = ConsumeLength(args, css_parser_mode, kValueRangeAll);
   if (!parsed_value)
     return false;
   transform_value->Append(*parsed_value);
@@ -81,7 +79,7 @@ CSSValue* ConsumeTransformValue(CSSParserTokenRange& range,
   CSSValueID function_id = range.Peek().FunctionId();
   if (function_id == CSSValueInvalid)
     return nullptr;
-  CSSParserTokenRange args = CSSPropertyParserHelpers::ConsumeFunction(range);
+  CSSParserTokenRange args = ConsumeFunction(range);
   if (args.AtEnd())
     return nullptr;
   CSSFunctionValue* transform_value = CSSFunctionValue::Create(function_id);
@@ -94,13 +92,15 @@ CSSValue* ConsumeTransformValue(CSSParserTokenRange& range,
     case CSSValueSkewX:
     case CSSValueSkewY:
     case CSSValueSkew:
-      parsed_value = CSSPropertyParserHelpers::ConsumeAngle(args);
+      parsed_value = ConsumeAngle(args, *context, UnitlessQuirk::kAllow,
+                                  UseCounter::kZeroAngleTransform);
       if (!parsed_value)
         return nullptr;
       if (function_id == CSSValueSkew &&
-          CSSPropertyParserHelpers::ConsumeCommaIncludingWhitespace(args)) {
+          ConsumeCommaIncludingWhitespace(args)) {
         transform_value->Append(*parsed_value);
-        parsed_value = CSSPropertyParserHelpers::ConsumeAngle(args);
+        parsed_value = ConsumeAngle(args, *context, UnitlessQuirk::kAllow,
+                                    UseCounter::kZeroAngleTransform);
         if (!parsed_value)
           return nullptr;
       }
@@ -109,15 +109,13 @@ CSSValue* ConsumeTransformValue(CSSParserTokenRange& range,
     case CSSValueScaleY:
     case CSSValueScaleZ:
     case CSSValueScale:
-      parsed_value =
-          CSSPropertyParserHelpers::ConsumeNumber(args, kValueRangeAll);
+      parsed_value = ConsumeNumber(args, kValueRangeAll);
       if (!parsed_value)
         return nullptr;
       if (function_id == CSSValueScale &&
-          CSSPropertyParserHelpers::ConsumeCommaIncludingWhitespace(args)) {
+          ConsumeCommaIncludingWhitespace(args)) {
         transform_value->Append(*parsed_value);
-        parsed_value =
-            CSSPropertyParserHelpers::ConsumeNumber(args, kValueRangeAll);
+        parsed_value = ConsumeNumber(args, kValueRangeAll);
         if (!parsed_value)
           return nullptr;
       }
@@ -131,22 +129,21 @@ CSSValue* ConsumeTransformValue(CSSParserTokenRange& range,
     case CSSValueTranslateX:
     case CSSValueTranslateY:
     case CSSValueTranslate:
-      parsed_value = CSSPropertyParserHelpers::ConsumeLengthOrPercent(
-          args, context->Mode(), kValueRangeAll);
+      parsed_value =
+          ConsumeLengthOrPercent(args, context->Mode(), kValueRangeAll);
       if (!parsed_value)
         return nullptr;
       if (function_id == CSSValueTranslate &&
-          CSSPropertyParserHelpers::ConsumeCommaIncludingWhitespace(args)) {
+          ConsumeCommaIncludingWhitespace(args)) {
         transform_value->Append(*parsed_value);
-        parsed_value = CSSPropertyParserHelpers::ConsumeLengthOrPercent(
-            args, context->Mode(), kValueRangeAll);
+        parsed_value =
+            ConsumeLengthOrPercent(args, context->Mode(), kValueRangeAll);
         if (!parsed_value)
           return nullptr;
       }
       break;
     case CSSValueTranslateZ:
-      parsed_value = CSSPropertyParserHelpers::ConsumeLength(
-          args, context->Mode(), kValueRangeAll);
+      parsed_value = ConsumeLength(args, context->Mode(), kValueRangeAll);
       break;
     case CSSValueMatrix:
     case CSSValueMatrix3d:
@@ -161,10 +158,11 @@ CSSValue* ConsumeTransformValue(CSSParserTokenRange& range,
       break;
     case CSSValueRotate3d:
       if (!ConsumeNumbers(args, transform_value, 3) ||
-          !CSSPropertyParserHelpers::ConsumeCommaIncludingWhitespace(args)) {
+          !ConsumeCommaIncludingWhitespace(args)) {
         return nullptr;
       }
-      parsed_value = CSSPropertyParserHelpers::ConsumeAngle(args);
+      parsed_value = ConsumeAngle(args, *context, UnitlessQuirk::kAllow,
+                                  UseCounter::kZeroAngleTransform);
       if (!parsed_value)
         return nullptr;
       break;
@@ -189,7 +187,7 @@ const CSSValue* CSSPropertyAPITransform::parseSingleValue(
     const CSSParserContext& context,
     CSSPropertyID unresolved_property) {
   if (range.Peek().Id() == CSSValueNone)
-    return CSSPropertyParserHelpers::ConsumeIdent(range);
+    return ConsumeIdent(range);
 
   CSSValueList* list = CSSValueList::CreateSpaceSeparated();
   do {