Revert of Remove platform/text/ParserUtilities.h

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

 /*
  * Copyright (C) 2004, 2005, 2008 Nikolas Zimmermann <zimmermann@kde.org>
  * Copyright (C) 2004, 2005, 2006, 2007 Rob Buis <buis@kde.org>
  * Copyright (C) 2010 Dirk Schulze <krit@webkit.org>
  *
  * 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 "core/svg/SVGPreserveAspectRatio.h"
 
 #include "core/svg/SVGAnimationElement.h"
 #include "core/svg/SVGParserUtilities.h"
-#include "platform/ParsingUtilities.h"
 #include "platform/geometry/FloatRect.h"
+#include "platform/text/ParserUtilities.h"
 #include "platform/transforms/AffineTransform.h"
 #include "wtf/text/WTFString.h"
 
 namespace blink {
 
 SVGPreserveAspectRatio::SVGPreserveAspectRatio()
 {
     setDefault();
 }
 
@@ skipping 20 matching lines @@
     SVGMeetOrSliceType meetOrSlice = SVG_MEETORSLICE_MEET;
 
     setAlign(align);
     setMeetOrSlice(meetOrSlice);
 
     const CharType* start = ptr;
     if (!skipOptionalSVGSpaces(ptr, end))
         return SVGParsingError(SVGParseStatus::ExpectedEnumeration, ptr - start);
 
     if (*ptr == 'n') {
-        if (!skipToken(ptr, end, "none"))
+        if (!skipString(ptr, end, "none"))
             return SVGParsingError(SVGParseStatus::ExpectedEnumeration, ptr - start);
         align = SVG_PRESERVEASPECTRATIO_NONE;
         skipOptionalSVGSpaces(ptr, end);
     } else if (*ptr == 'x') {
         if ((end - ptr) < 8)
             return SVGParsingError(SVGParseStatus::ExpectedEnumeration, ptr - start);
         if (ptr[1] != 'M' || ptr[4] != 'Y' || ptr[5] != 'M')
             return SVGParsingError(SVGParseStatus::ExpectedEnumeration, ptr - start);
         if (ptr[2] == 'i') {
             if (ptr[3] == 'n') {
@@ skipping 42 matching lines @@
             return SVGParsingError(SVGParseStatus::ExpectedEnumeration, ptr - start);
         }
         ptr += 8;
         skipOptionalSVGSpaces(ptr, end);
     } else {
         return SVGParsingError(SVGParseStatus::ExpectedEnumeration, ptr - start);
     }
 
     if (ptr < end) {
         if (*ptr == 'm') {
-            if (!skipToken(ptr, end, "meet"))
+            if (!skipString(ptr, end, "meet"))
                 return SVGParsingError(SVGParseStatus::ExpectedEnumeration, ptr - start);
             skipOptionalSVGSpaces(ptr, end);
         } else if (*ptr == 's') {
-            if (!skipToken(ptr, end, "slice"))
+            if (!skipString(ptr, end, "slice"))
                 return SVGParsingError(SVGParseStatus::ExpectedEnumeration, ptr - start);
             skipOptionalSVGSpaces(ptr, end);
             if (align != SVG_PRESERVEASPECTRATIO_NONE)
                 meetOrSlice = SVG_MEETORSLICE_SLICE;
         }
     }
 
     if (end != ptr && validate)
         return SVGParsingError(SVGParseStatus::TrailingGarbage, ptr - start);
 
@@ skipping 251 matching lines @@
     m_meetOrSlice = preserveAspectRatioToUse->m_meetOrSlice;
 }
 
 float SVGPreserveAspectRatio::calculateDistance(SVGPropertyBase* toValue, SVGElement* contextElement)
 {
     // No paced animations for SVGPreserveAspectRatio.
     return -1;
 }
 
 } // namespace blink