Move scroll-snap related properties into CSSPropertyParser

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 858 matching lines @@
     case CSSPropertyRx:
     case CSSPropertyRy:
     case CSSPropertyScale:
     case CSSPropertyTranslate:
     case CSSPropertyCursor:
     case CSSPropertyTransformOrigin:
     case CSSPropertyContent:
     case CSSPropertyListStyleImage:
     case CSSPropertyListStyle:
     case CSSPropertyPerspective:
+    case CSSPropertyScrollSnapCoordinate:
+    case CSSPropertyScrollSnapPointsX:
+    case CSSPropertyScrollSnapPointsY:
         validPrimitive = false;
         break;
 
-    case CSSPropertyScrollSnapPointsX:
-    case CSSPropertyScrollSnapPointsY:
-        parsedValue = parseScrollSnapPoints();
-        break;
-    case CSSPropertyScrollSnapCoordinate:
-        parsedValue = parseScrollSnapCoordinate();
-        break;
-
     default:
         // If you crash here, it's because you added a css property and are not handling it
         // in either this switch statement or the one in CSSPropertyParser::parseSingleValue.
         ASSERT_WITH_MESSAGE(0, "unimplemented propertyID: %d", propId);
         return false;
     }
 
     if (validPrimitive) {
         parsedValue = parseValidPrimitive(id, value);
         m_valueList->next();
@@ skipping 288 matching lines @@
             break;
         }
         default: {
             return false;
         }
     }
 
     return true;
 }
 
-PassRefPtrWillBeRawPtr<CSSValue> CSSPropertyParser::parseScrollSnapPoints()
-{
-    CSSParserValue* value = m_valueList->current();
-
-    if (value->id == CSSValueNone) {
-        m_valueList->next();
-        return cssValuePool().createIdentifierValue(CSSValueNone);
-    }
-
-    if (value->m_unit == CSSParserValue::Function && value->function->id == CSSValueRepeat) {
-        // The spec defines the following grammar: repeat( <length>)
-        CSSParserValueList* arguments = value->function->args.get();
-        if (!arguments || arguments->size() != 1)
-            return nullptr;
-
-        CSSParserValue* repeatValue = arguments->valueAt(0);
-        if (validUnit(repeatValue, FNonNeg | FLength | FPercent) && (m_parsedCalculation || repeatValue->fValue > 0)) {
-            RefPtrWillBeRawPtr<CSSFunctionValue> result = CSSFunctionValue::create(CSSValueRepeat);
-            result->append(parseValidPrimitive(repeatValue->id, repeatValue));
-            m_valueList->next();
-            return result.release();
-        }
-    }
-
-    return nullptr;
-}
-
-PassRefPtrWillBeRawPtr<CSSValue> CSSPropertyParser::parseScrollSnapCoordinate()
-{
-    if (m_valueList->current()->id == CSSValueNone) {
-        m_valueList->next();
-        return cssValuePool().createIdentifierValue(CSSValueNone);
-    }
-
-    return parsePositionList(m_valueList);
-}
-
 PassRefPtrWillBeRawPtr<CSSValue> CSSPropertyParser::parseColor(const CSSParserValue* value, bool acceptQuirkyColors)
 {
     CSSValueID id = value->id;
     if (isColorKeyword(id)) {
         if (!isValueAllowedInMode(id, m_context.mode()))
             return nullptr;
         if (id == CSSValueWebkitText && m_context.useCounter())
             m_context.useCounter()->count(UseCounter::WebkitTextInColorProperty);
         return cssValuePool().createIdentifierValue(id);
     }
@@ skipping 2066 matching lines @@
     val = m_valueList->next();
     if (val) {
         mask = parseBorderImage(CSSPropertyWebkitBoxReflect);
         if (!mask)
             return nullptr;
     }
 
     return CSSReflectValue::create(direction.release(), offset.release(), mask.release());
 }
 
-PassRefPtrWillBeRawPtr<CSSValue> CSSPropertyParser::parsePosition(CSSParserValueList* valueList)
-{
-    RefPtrWillBeRawPtr<CSSValue> xValue = nullptr;
-    RefPtrWillBeRawPtr<CSSValue> yValue = nullptr;
-    parseFillPosition(valueList, xValue, yValue);
-    if (!xValue || !yValue)
-        return nullptr;
-    return CSSValuePair::create(xValue.release(), yValue.release(), CSSValuePair::KeepIdenticalValues);
-}
-
-// Parses a list of comma separated positions. i.e., <position>#
-PassRefPtrWillBeRawPtr<CSSValueList> CSSPropertyParser::parsePositionList(CSSParserValueList* valueList)
-{
-    RefPtrWillBeRawPtr<CSSValueList> positions = CSSValueList::createCommaSeparated();
-    while (true) {
-        // parsePosition consumes values until it reaches a separator [,/],
-        // an invalid token, or end of the list
-        RefPtrWillBeRawPtr<CSSValue> position = parsePosition(valueList);
-        if (!position)
-            return nullptr;
-        positions->append(position);
-
-        if (!valueList->current())
-            break;
-        if (!consumeComma(valueList) || !valueList->current())
-            return nullptr;
-    }
-
-    return positions.release();
-}
-
 class BorderImageParseContext {
     STACK_ALLOCATED();
 public:
     BorderImageParseContext()
     : m_canAdvance(false)
     , m_allowCommit(true)
     , m_allowImage(true)
     , m_allowImageSlice(true)
     , m_allowRepeat(true)
     , m_allowForwardSlashOperator(false)
@@ skipping 1330 matching lines @@
     ASSERT(!m_parsedCalculation);
     m_parsedCalculation = CSSCalcValue::create(args, range);
 
     if (!m_parsedCalculation)
         return false;
 
     return true;
 }
 
 } // namespace blink