Added CSSPropertyPositionUtils which holds position parsing methods.

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 "core/StylePropertyShorthand.h"
 #include "core/css/CSSBasicShapeValues.h"
 #include "core/css/CSSBorderImage.h"
 #include "core/css/CSSContentDistributionValue.h"
@@ skipping 25 matching lines @@
 #include "core/css/CSSVariableReferenceValue.h"
 #include "core/css/FontFace.h"
 #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/properties/CSSPropertyAlignmentUtils.h"
 #include "core/css/properties/CSSPropertyDescriptor.h"
+#include "core/css/properties/CSSPropertyPositionUtils.h"
 #include "core/frame/UseCounter.h"
 #include "core/layout/LayoutTheme.h"
 #include "core/svg/SVGPathUtilities.h"
 #include "wtf/text/StringBuilder.h"
 #include <memory>
 
 namespace blink {
 
 using namespace CSSPropertyParserHelpers;
 
@@ skipping 1328 matching lines @@
     CSSValue* parsedTransformValue =
         consumeTransformValue(range, context, useLegacyParsing);
     if (!parsedTransformValue)
       return nullptr;
     list->append(*parsedTransformValue);
   } while (!range.atEnd());
 
   return list;
 }
 
-template <CSSValueID start, CSSValueID end>
-static CSSValue* consumePositionLonghand(CSSParserTokenRange& range,
-                                         CSSParserMode cssParserMode) {
-  if (range.peek().type() == IdentToken) {
-    CSSValueID id = range.peek().id();
-    int percent;
-    if (id == start)
-      percent = 0;
-    else if (id == CSSValueCenter)
-      percent = 50;
-    else if (id == end)
-      percent = 100;
-    else
-      return nullptr;
-    range.consumeIncludingWhitespace();
-    return CSSPrimitiveValue::create(percent,
-                                     CSSPrimitiveValue::UnitType::Percentage);
-  }
-  return consumeLengthOrPercent(range, cssParserMode, ValueRangeAll);
-}
-
-static CSSValue* consumePositionX(CSSParserTokenRange& range,
-                                  CSSParserMode cssParserMode) {
-  return consumePositionLonghand<CSSValueLeft, CSSValueRight>(range,
-                                                              cssParserMode);
-}
-
-static CSSValue* consumePositionY(CSSParserTokenRange& range,
-                                  CSSParserMode cssParserMode) {
-  return consumePositionLonghand<CSSValueTop, CSSValueBottom>(range,
-                                                              cssParserMode);
-}
-
 static CSSValue* consumeNoneOrURI(CSSParserTokenRange& range,
                                   const CSSParserContext* context) {
   if (range.peek().id() == CSSValueNone)
     return consumeIdent(range);
   return consumeUrl(range, context);
 }
 
 static CSSValue* consumeBaselineShift(CSSParserTokenRange& range) {
   CSSValueID id = range.peek().id();
   if (id == CSSValueBaseline || id == CSSValueSub || id == CSSValueSuper)
@@ skipping 607 matching lines @@
     case CSSPropertyWebkitBackgroundClip:
     case CSSPropertyWebkitBackgroundOrigin:
     case CSSPropertyWebkitMaskClip:
     case CSSPropertyWebkitMaskOrigin:
       return consumePrefixedBackgroundBox(unresolvedProperty, range, context);
     case CSSPropertyBackgroundImage:
     case CSSPropertyWebkitMaskImage:
       return consumeImageOrNone(range, context);
     case CSSPropertyBackgroundPositionX:
     case CSSPropertyWebkitMaskPositionX:
-      return consumePositionX(range, context->mode());
+      return CSSPropertyPositionUtils::consumePositionLonghand<CSSValueLeft,
+                                                               CSSValueRight>(
+          range, context->mode());
     case CSSPropertyBackgroundPositionY:
     case CSSPropertyWebkitMaskPositionY:
-      return consumePositionY(range, context->mode());
+      return CSSPropertyPositionUtils::consumePositionLonghand<CSSValueTop,
+                                                               CSSValueBottom>(
+          range, context->mode());
     case CSSPropertyBackgroundSize:
     case CSSPropertyAliasWebkitBackgroundSize:
     case CSSPropertyWebkitMaskSize:
       return consumeBackgroundSize(unresolvedProperty, range, context->mode());
     case CSSPropertyBackgroundColor:
       return consumeColor(range, context->mode());
     default:
       break;
   };
   return nullptr;
@@ skipping 717 matching lines @@
       return consumeOffsetRotate(m_range);
     case CSSPropertyOutlineWidth:
       return consumeLineWidth(m_range, m_context->mode(),
                               UnitlessQuirk::Forbid);
     case CSSPropertyTransform:
       return consumeTransform(
           m_range, m_context,
           unresolvedProperty == CSSPropertyAliasWebkitTransform);
     case CSSPropertyWebkitTransformOriginX:
     case CSSPropertyWebkitPerspectiveOriginX:
-      return consumePositionX(m_range, m_context->mode());
+      return CSSPropertyPositionUtils::consumePositionLonghand<CSSValueLeft,
+                                                               CSSValueRight>(
+          m_range, m_context->mode());
     case CSSPropertyWebkitTransformOriginY:
     case CSSPropertyWebkitPerspectiveOriginY:
-      return consumePositionY(m_range, m_context->mode());
+      return CSSPropertyPositionUtils::consumePositionLonghand<CSSValueTop,
+                                                               CSSValueBottom>(
+          m_range, m_context->mode());
     case CSSPropertyMarkerStart:
     case CSSPropertyMarkerMid:
     case CSSPropertyMarkerEnd:
     case CSSPropertyMask:
       return consumeNoneOrURI(m_range, m_context);
     case CSSPropertyFlexGrow:
     case CSSPropertyFlexShrink:
       return consumeNumber(m_range, ValueRangeNonNegative);
     case CSSPropertyColumnRuleWidth:
       return consumeColumnRuleWidth(m_range, m_context->mode());
@@ skipping 1590 matching lines @@
     case CSSPropertyGridTemplate:
       return consumeGridTemplateShorthand(CSSPropertyGridTemplate, important);
     case CSSPropertyGrid:
       return consumeGridShorthand(important);
     default:
       return false;
   }
 }
 
 }  // namespace blink