| OLD | NEW | 
|---|
| 1 /* | 1 /* | 
| 2  * Copyright (C) 2002, 2003 The Karbon Developers | 2  * Copyright (C) 2002, 2003 The Karbon Developers | 
| 3  * Copyright (C) 2006, 2007 Rob Buis <buis@kde.org> | 3  * Copyright (C) 2006, 2007 Rob Buis <buis@kde.org> | 
| 4  * Copyright (C) 2013 Apple Inc. All rights reserved. | 4  * Copyright (C) 2013 Apple Inc. All rights reserved. | 
| 5  * | 5  * | 
| 6  * This library is free software; you can redistribute it and/or | 6  * This library is free software; you can redistribute it and/or | 
| 7  * modify it under the terms of the GNU Library General Public | 7  * modify it under the terms of the GNU Library General Public | 
| 8  * License as published by the Free Software Foundation; either | 8  * License as published by the Free Software Foundation; either | 
| 9  * version 2 of the License, or (at your option) any later version. | 9  * version 2 of the License, or (at your option) any later version. | 
| 10  * | 10  * | 
| 11  * This library is distributed in the hope that it will be useful, | 11  * This library is distributed in the hope that it will be useful, | 
| 12  * but WITHOUT ANY WARRANTY; without even the implied warranty of | 12  * but WITHOUT ANY WARRANTY; without even the implied warranty of | 
| 13  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU | 13  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU | 
| 14  * Library General Public License for more details. | 14  * Library General Public License for more details. | 
| 15  * | 15  * | 
| 16  * You should have received a copy of the GNU Library General Public License | 16  * You should have received a copy of the GNU Library General Public License | 
| 17  * along with this library; see the file COPYING.LIB.  If not, write to | 17  * along with this library; see the file COPYING.LIB.  If not, write to | 
| 18  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, | 18  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, | 
| 19  * Boston, MA 02110-1301, USA. | 19  * Boston, MA 02110-1301, USA. | 
| 20  */ | 20  */ | 
| 21 | 21 | 
| 22 #ifndef SVGParserUtilities_h | 22 #ifndef SVGParserUtilities_h | 
| 23 #define SVGParserUtilities_h | 23 #define SVGParserUtilities_h | 
| 24 | 24 | 
|  | 25 #include "core/html/parser/HTMLParserIdioms.h" | 
| 25 #include "core/svg/SVGTransform.h" | 26 #include "core/svg/SVGTransform.h" | 
| 26 #include "platform/text/ParserUtilities.h" | 27 #include "platform/text/ParserUtilities.h" | 
| 27 #include "wtf/HashSet.h" | 28 #include "wtf/HashSet.h" | 
| 28 | 29 | 
| 29 typedef pair<unsigned, unsigned> UnicodeRange; | 30 typedef pair<unsigned, unsigned> UnicodeRange; | 
| 30 typedef Vector<UnicodeRange> UnicodeRanges; | 31 typedef Vector<UnicodeRange> UnicodeRanges; | 
| 31 | 32 | 
| 32 namespace WebCore { | 33 namespace WebCore { | 
| 33 | 34 | 
| 34 class FloatPoint; | 35 class FloatPoint; | 
| 35 class FloatRect; | 36 class FloatRect; | 
| 36 class SVGPointList; | 37 class SVGPointList; | 
| 37 | 38 | 
|  | 39 enum WhitespaceMode { | 
|  | 40     DisallowWhitespace = 0, | 
|  | 41     AllowLeadingWhitespace = 0x1, | 
|  | 42     AllowTrailingWhitespace = 0x2, | 
|  | 43     AllowLeadingAndTrailingWhitespace = AllowLeadingWhitespace | AllowTrailingWh
    itespace | 
|  | 44 }; | 
|  | 45 | 
| 38 template <typename CharType> | 46 template <typename CharType> | 
| 39 bool parseSVGNumber(CharType* ptr, size_t length, double& number); | 47 bool parseSVGNumber(CharType* ptr, size_t length, double& number); | 
| 40 bool parseNumber(const LChar*& ptr, const LChar* end, float& number, bool skip =
     true); | 48 bool parseNumber(const LChar*& ptr, const LChar* end, float& number, WhitespaceM
    ode = AllowLeadingAndTrailingWhitespace); | 
| 41 bool parseNumber(const UChar*& ptr, const UChar* end, float& number, bool skip =
     true); | 49 bool parseNumber(const UChar*& ptr, const UChar* end, float& number, WhitespaceM
    ode = AllowLeadingAndTrailingWhitespace); | 
| 42 bool parseNumberOptionalNumber(const String& s, float& h, float& v); | 50 bool parseNumberOptionalNumber(const String& s, float& h, float& v); | 
|  | 51 bool parseNumberOrPercentage(const String& s, float& number); | 
| 43 bool parseArcFlag(const LChar*& ptr, const LChar* end, bool& flag); | 52 bool parseArcFlag(const LChar*& ptr, const LChar* end, bool& flag); | 
| 44 bool parseArcFlag(const UChar*& ptr, const UChar* end, bool& flag); | 53 bool parseArcFlag(const UChar*& ptr, const UChar* end, bool& flag); | 
| 45 | 54 | 
| 46 template <typename CharType> | 55 template <typename CharType> | 
| 47 bool parseFloatPoint(const CharType*& current, const CharType* end, FloatPoint&)
    ; | 56 bool parseFloatPoint(const CharType*& current, const CharType* end, FloatPoint&)
    ; | 
| 48 template <typename CharType> | 57 template <typename CharType> | 
| 49 bool parseFloatPoint2(const CharType*& current, const CharType* end, FloatPoint&
    , FloatPoint&); | 58 bool parseFloatPoint2(const CharType*& current, const CharType* end, FloatPoint&
    , FloatPoint&); | 
| 50 template <typename CharType> | 59 template <typename CharType> | 
| 51 bool parseFloatPoint3(const CharType*& current, const CharType* end, FloatPoint&
    , FloatPoint&, FloatPoint&); | 60 bool parseFloatPoint3(const CharType*& current, const CharType* end, FloatPoint&
    , FloatPoint&, FloatPoint&); | 
| 52 | 61 | 
| 53 // SVG allows several different whitespace characters: |  | 
| 54 // http://www.w3.org/TR/SVG/paths.html#PathDataBNF |  | 
| 55 template <typename CharType> |  | 
| 56 inline bool isSVGSpace(CharType c) |  | 
| 57 { |  | 
| 58     return c == ' ' || c == '\t' || c == '\n' || c == '\r'; |  | 
| 59 } |  | 
| 60 |  | 
| 61 template <typename CharType> | 62 template <typename CharType> | 
| 62 inline bool skipOptionalSVGSpaces(const CharType*& ptr, const CharType* end) | 63 inline bool skipOptionalSVGSpaces(const CharType*& ptr, const CharType* end) | 
| 63 { | 64 { | 
| 64     while (ptr < end && isSVGSpace(*ptr)) | 65     while (ptr < end && isHTMLSpace<CharType>(*ptr)) | 
| 65         ptr++; | 66         ptr++; | 
| 66     return ptr < end; | 67     return ptr < end; | 
| 67 } | 68 } | 
| 68 | 69 | 
| 69 template <typename CharType> | 70 template <typename CharType> | 
| 70 inline bool skipOptionalSVGSpacesOrDelimiter(const CharType*& ptr, const CharTyp
    e* end, char delimiter = ',') | 71 inline bool skipOptionalSVGSpacesOrDelimiter(const CharType*& ptr, const CharTyp
    e* end, char delimiter = ',') | 
| 71 { | 72 { | 
| 72     if (ptr < end && !isSVGSpace(*ptr) && *ptr != delimiter) | 73     if (ptr < end && !isHTMLSpace<CharType>(*ptr) && *ptr != delimiter) | 
| 73         return false; | 74         return false; | 
| 74     if (skipOptionalSVGSpaces(ptr, end)) { | 75     if (skipOptionalSVGSpaces(ptr, end)) { | 
| 75         if (ptr < end && *ptr == delimiter) { | 76         if (ptr < end && *ptr == delimiter) { | 
| 76             ptr++; | 77             ptr++; | 
| 77             skipOptionalSVGSpaces(ptr, end); | 78             skipOptionalSVGSpaces(ptr, end); | 
| 78         } | 79         } | 
| 79     } | 80     } | 
| 80     return ptr < end; | 81     return ptr < end; | 
| 81 } | 82 } | 
| 82 | 83 | 
| 83 Vector<String> parseDelimitedString(const String& input, const char seperator); | 84 Vector<String> parseDelimitedString(const String& input, const char seperator); | 
| 84 bool parseKerningUnicodeString(const String& input, UnicodeRanges&, HashSet<Stri
    ng>& stringList); | 85 bool parseKerningUnicodeString(const String& input, UnicodeRanges&, HashSet<Stri
    ng>& stringList); | 
| 85 bool parseGlyphName(const String& input, HashSet<String>& values); | 86 bool parseGlyphName(const String& input, HashSet<String>& values); | 
| 86 | 87 | 
| 87 template<typename CharType> | 88 template<typename CharType> | 
| 88 bool parseAndSkipTransformType(const CharType*& ptr, const CharType* end, SVGTra
    nsformType&); | 89 bool parseAndSkipTransformType(const CharType*& ptr, const CharType* end, SVGTra
    nsformType&); | 
| 89 SVGTransformType parseTransformType(const String&); | 90 SVGTransformType parseTransformType(const String&); | 
| 90 | 91 | 
| 91 } // namespace WebCore | 92 } // namespace WebCore | 
| 92 | 93 | 
| 93 #endif // SVGParserUtilities_h | 94 #endif // SVGParserUtilities_h | 
| OLD | NEW | 
|---|