Tidy up SVGParserUtilities

third_party/WebKit/Source/core/svg/SVGTransformList.cpp

 /*
  * Copyright (C) 2004, 2005, 2008 Nikolas Zimmermann <zimmermann@kde.org>
  * Copyright (C) 2004, 2005, 2006, 2007 Rob Buis <buis@kde.org>
  * Copyright (C) 2007 Eric Seidel <eric@webkit.org>
  * Copyright (C) 2008 Apple Inc. All rights reserved.
  * Copyright (C) Research In Motion Limited 2012. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public License
  * along with this library; see the file COPYING.LIB.  If not, write to
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
 
 #include "config.h"
-
 #include "core/svg/SVGTransformList.h"
 
 #include "core/SVGNames.h"
-#include "core/svg/SVGAnimateTransformElement.h"
-#include "core/svg/SVGAnimatedNumber.h"
 #include "core/svg/SVGParserUtilities.h"
 #include "core/svg/SVGTransformDistance.h"
+#include "platform/text/ParserUtilities.h"
 #include "wtf/text/StringBuilder.h"
 #include "wtf/text/WTFString.h"
 
 namespace blink {
 
 SVGTransformList::SVGTransformList()
 {
 }
 
 SVGTransformList::~SVGTransformList()
@@ skipping 19 matching lines @@
     ConstIterator it = begin();
     ConstIterator itEnd = end();
     for (; it != itEnd; ++it)
         result *= it->matrix();
 
     return true;
 }
 
 namespace {
 
+const LChar skewXDesc[] =  {'s', 'k', 'e', 'w', 'X'};
+const LChar skewYDesc[] =  {'s', 'k', 'e', 'w', 'Y'};
+const LChar scaleDesc[] =  {'s', 'c', 'a', 'l', 'e'};
+const LChar translateDesc[] =  {'t', 'r', 'a', 'n', 's', 'l', 'a', 't', 'e'};
+const LChar rotateDesc[] =  {'r', 'o', 't', 'a', 't', 'e'};
+const LChar matrixDesc[] =  {'m', 'a', 't', 'r', 'i', 'x'};
+
+template<typename CharType>
+bool parseAndSkipTransformType(const CharType*& ptr, const CharType* end, SVGTransformType& type)
+{
+    if (ptr >= end)
+        return false;
+
+    if (*ptr == 's') {
+        if (skipString(ptr, end, skewXDesc, WTF_ARRAY_LENGTH(skewXDesc)))
+            type = SVG_TRANSFORM_SKEWX;
+        else if (skipString(ptr, end, skewYDesc, WTF_ARRAY_LENGTH(skewYDesc)))
+            type = SVG_TRANSFORM_SKEWY;
+        else if (skipString(ptr, end, scaleDesc, WTF_ARRAY_LENGTH(scaleDesc)))
+            type = SVG_TRANSFORM_SCALE;
+        else
+            return false;
+    } else if (skipString(ptr, end, translateDesc, WTF_ARRAY_LENGTH(translateDesc))) {
+        type = SVG_TRANSFORM_TRANSLATE;
+    } else if (skipString(ptr, end, rotateDesc, WTF_ARRAY_LENGTH(rotateDesc))) {
+        type = SVG_TRANSFORM_ROTATE;
+    } else if (skipString(ptr, end, matrixDesc, WTF_ARRAY_LENGTH(matrixDesc))) {
+        type = SVG_TRANSFORM_MATRIX;
+    } else {
+        return false;
+    }
+    return true;
+}
+
 template<typename CharType>
 int parseTransformParamList(const CharType*& ptr, const CharType* end, float* values, int required, int optional)
 {
     int parsedParams = 0;
     int maxPossibleParams = required + optional;
 
     bool trailingDelimiter = false;
 
     skipOptionalSVGSpaces(ptr, end);
     while (parsedParams < maxPossibleParams) {
@@ skipping 12 matching lines @@
         }
     }
 
     if (trailingDelimiter || !(parsedParams == required || parsedParams == maxPossibleParams))
         return -1;
 
     return parsedParams;
 }
 
 // These should be kept in sync with enum SVGTransformType
-static const int requiredValuesForType[] =  {0, 6, 1, 1, 1, 1, 1};
-static const int optionalValuesForType[] =  {0, 0, 1, 1, 2, 0, 0};
+const int requiredValuesForType[] =  {0, 6, 1, 1, 1, 1, 1};
+const int optionalValuesForType[] =  {0, 0, 1, 1, 2, 0, 0};
 
 template<typename CharType>
 PassRefPtrWillBeRawPtr<SVGTransform> parseTransformOfType(unsigned type, const CharType*& ptr, const CharType* end)
 {
     if (type == SVG_TRANSFORM_UNKNOWN)
         return nullptr;
 
     int valueCount = 0;
     float values[] = {0, 0, 0, 0, 0, 0};
     if ((valueCount = parseTransformParamList(ptr, end, values, requiredValuesForType[type], optionalValuesForType[type])) < 0) {
@@ skipping 79 matching lines @@
 bool SVGTransformList::parse(const UChar*& ptr, const UChar* end)
 {
     return parseInternal(ptr, end);
 }
 
 bool SVGTransformList::parse(const LChar*& ptr, const LChar* end)
 {
     return parseInternal(ptr, end);
 }
 
+SVGTransformType parseTransformType(const String& string)
+{
+    if (string.isEmpty())
+        return SVG_TRANSFORM_UNKNOWN;
+    SVGTransformType type = SVG_TRANSFORM_UNKNOWN;
+    if (string.is8Bit()) {
+        const LChar* ptr = string.characters8();
+        const LChar* end = ptr + string.length();
+        parseAndSkipTransformType(ptr, end, type);
+    } else {
+        const UChar* ptr = string.characters16();
+        const UChar* end = ptr + string.length();
+        parseAndSkipTransformType(ptr, end, type);
+    }
+    return type;
+}
+
 String SVGTransformList::valueAsString() const
 {
     StringBuilder builder;
 
     ConstIterator it = begin();
     ConstIterator itEnd = end();
     while (it != itEnd) {
         builder.append(it->valueAsString());
         ++it;
         if (it != itEnd)
@@ skipping 123 matching lines @@
     if (at(0)->transformType() == toList->at(0)->transformType())
         return -1;
 
     // Spec: http://www.w3.org/TR/SVG/animate.html#complexDistances
     // Paced animations assume a notion of distance between the various animation values defined by the 'to', 'from', 'by' and 'values' attributes.
     // Distance is defined only for scalar types (such as <length>), colors and the subset of transformation types that are supported by 'animateTransform'.
     return SVGTransformDistance(at(0), toList->at(0)).distance();
 }
 
 }