Parse motion shorthand in CSSPropertyParser with CSSParserTokens

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 21 matching lines @@
 #include "core/css/CSSBorderImage.h"
 #include "core/css/CSSContentDistributionValue.h"
 #include "core/css/CSSCounterValue.h"
 #include "core/css/CSSCrossfadeValue.h"
 #include "core/css/CSSCursorImageValue.h"
 #include "core/css/CSSCustomIdentValue.h"
 #include "core/css/CSSFunctionValue.h"
 #include "core/css/CSSGridLineNamesValue.h"
 #include "core/css/CSSImageSetValue.h"
 #include "core/css/CSSImageValue.h"
-#include "core/css/CSSPathValue.h"
 #include "core/css/CSSPrimitiveValueMappings.h"
 #include "core/css/CSSProperty.h"
 #include "core/css/CSSPropertyMetadata.h"
 #include "core/css/CSSQuadValue.h"
 #include "core/css/CSSReflectValue.h"
 #include "core/css/CSSShadowValue.h"
 #include "core/css/CSSStringValue.h"
 #include "core/css/CSSTimingFunctionValue.h"
 #include "core/css/CSSURIValue.h"
 #include "core/css/CSSValuePair.h"
 #include "core/css/CSSValuePool.h"
 #include "core/css/HashTools.h"
 #include "core/css/parser/CSSParserFastPaths.h"
 #include "core/css/parser/CSSParserValues.h"
 #include "core/frame/UseCounter.h"
 #include "core/style/GridCoordinate.h"
-#include "core/svg/SVGPathUtilities.h"
 #include "platform/RuntimeEnabledFeatures.h"
 
 namespace blink {
 
 template <unsigned N>
 static bool equalIgnoringCase(const CSSParserString& a, const char (&b)[N])
 {
     unsigned length = N - 1; // Ignore the trailing null character
     if (a.length() != length)
         return false;
@@ skipping 830 matching lines @@
         RefPtrWillBeRawPtr<CSSValueList> list = parseTransformOrigin();
         if (!list || list->length() == 3)
             return false;
         // This values are added to match gecko serialization.
         if (list->length() == 1)
             list->append(cssValuePool().createValue(50, CSSPrimitiveValue::UnitType::Percentage));
         addProperty(propId, list.release(), important);
         return true;
     }
 
-    case CSSPropertyMotion:
-        // <motion-path> && <motion-offset> && <motion-rotation>
-        ASSERT(RuntimeEnabledFeatures::cssMotionPathEnabled());
-        return parseShorthand(propId, motionShorthand(), important);
-    case CSSPropertyMotionPath:
-        ASSERT(RuntimeEnabledFeatures::cssMotionPathEnabled());
-        if (id == CSSValueNone)
-            validPrimitive = true;
-        else
-            parsedValue = parseMotionPath();
-        break;
-    case CSSPropertyMotionOffset:
-        ASSERT(RuntimeEnabledFeatures::cssMotionPathEnabled());
-        validPrimitive = validUnit(value, FLength | FPercent);
-        break;
-    case CSSPropertyMotionRotation:
-        ASSERT(RuntimeEnabledFeatures::cssMotionPathEnabled());
-        parsedValue = parseMotionRotation();
-        break;
-
     case CSSPropertyJustifyContent:
         ASSERT(RuntimeEnabledFeatures::cssGridLayoutEnabled());
         parsedValue = parseContentDistributionOverflowPosition();
         break;
     case CSSPropertyJustifySelf:
         ASSERT(RuntimeEnabledFeatures::cssGridLayoutEnabled());
         return parseItemPositionOverflowPosition(propId, important);
     case CSSPropertyJustifyItems:
         ASSERT(RuntimeEnabledFeatures::cssGridLayoutEnabled());
 
@@ skipping 266 matching lines @@
     case CSSPropertyOrphans:
     case CSSPropertyWidows:
     case CSSPropertyWebkitTapHighlightColor:
     case CSSPropertyWebkitTextFillColor:
     case CSSPropertyColor:
     case CSSPropertyZIndex:
     case CSSPropertyTextShadow:
     case CSSPropertyBoxShadow:
     case CSSPropertyWebkitFilter:
     case CSSPropertyBackdropFilter:
+    case CSSPropertyMotionPath:
+    case CSSPropertyMotionOffset:
+    case CSSPropertyMotionRotation:
+    case CSSPropertyMotion:
         validPrimitive = false;
         break;
 
     case CSSPropertyScrollSnapPointsX:
     case CSSPropertyScrollSnapPointsY:
         parsedValue = parseScrollSnapPoints();
         break;
     case CSSPropertyScrollSnapCoordinate:
         parsedValue = parseScrollSnapCoordinate();
         break;
@@ skipping 4771 matching lines @@
         if (!isComma(a))
             return nullptr;
         a = args->next();
 
         argNumber++;
     }
 
     return transformValue.release();
 }
 
-PassRefPtrWillBeRawPtr<CSSValue> CSSPropertyParser::parseMotionPath()
-{
-    CSSParserValue* value = m_valueList->current();
-
-    // FIXME: Add support for <url>, <basic-shape>, <geometry-box>.
-    if (value->m_unit != CSSParserValue::Function || value->function->id != CSSValuePath)
-        return nullptr;
-
-    // FIXME: Add support for <fill-rule>.
-    CSSParserValueList* functionArgs = value->function->args.get();
-    if (!functionArgs || functionArgs->size() != 1 || !functionArgs->current())
-        return nullptr;
-
-    CSSParserValue* arg = functionArgs->current();
-    if (arg->m_unit != CSSParserValue::String)
-        return nullptr;
-
-    String pathString = arg->string;
-    Path path;
-    if (!buildPathFromString(pathString, path))
-        return nullptr;
-
-    m_valueList->next();
-    return CSSPathValue::create(pathString);
-}
-
-PassRefPtrWillBeRawPtr<CSSValue> CSSPropertyParser::parseMotionRotation()
-{
-    RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSpaceSeparated();
-    bool hasAutoOrReverse = false;
-    bool hasAngle = false;
-
-    for (CSSParserValue* value = m_valueList->current(); value; value = m_valueList->next()) {
-        if ((value->id == CSSValueAuto || value->id == CSSValueReverse) && !hasAutoOrReverse) {
-            list->append(cssValuePool().createIdentifierValue(value->id));
-            hasAutoOrReverse = true;
-        } else if (!hasAngle && validUnit(value, FAngle)) {
-            list->append(createPrimitiveNumericValue(value));
-            hasAngle = true;
-        } else {
-            break;
-        }
-    }
-
-    if (!list->length())
-        return nullptr;
-
-    return list.release();
-}
-
 } // namespace blink