Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(439)

Side by Side Diff: third_party/WebKit/Source/core/svg/SVGParsingError.h

Issue 1588993005: Extended error reporting for SVG attribute parsing (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add PLATFORM_EXPORT Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) Research In Motion Limited 2011. All rights reserved. 2 * Copyright (C) Research In Motion Limited 2011. All rights reserved.
3 * Copyright (C) 2011 Apple, Inc. All rights reserved. 3 * Copyright (C) 2011 Apple, Inc. All rights reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
11 * notice, this list of conditions and the following disclaimer in the 11 * notice, this list of conditions and the following disclaimer in the
12 * documentation and/or other materials provided with the distribution. 12 * documentation and/or other materials provided with the distribution.
13 * 13 *
14 * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY 14 * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
15 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 15 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
16 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 16 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
17 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR 17 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
18 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 18 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
19 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 19 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
20 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 20 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
21 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 21 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
22 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 22 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
24 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 24 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
25 */ 25 */
26 26
27 #ifndef SVGParsingError_h 27 #ifndef SVGParsingError_h
28 #define SVGParsingError_h 28 #define SVGParsingError_h
29 29
30 #include "wtf/MathExtras.h"
31 #include "wtf/text/WTFString.h"
32
30 namespace blink { 33 namespace blink {
31 34
32 enum SVGParsingError { 35 class QualifiedName;
36
37 enum class SVGParseStatus {
33 NoError, 38 NoError,
34 ParsingAttributeFailedError, 39
35 NegativeValueForbiddenError 40 // Syntax errors
41 TrailingGarbage,
42 ExpectedBoolean,
43 ExpectedEnumeration,
44
45 // Semantic errors
46 NegativeValue,
47
48 // Generic error
49 ParsingFailed,
36 }; 50 };
37 51
52 class SVGParsingError {
53 STACK_ALLOCATED();
54 public:
55 SVGParsingError(SVGParseStatus status = SVGParseStatus::NoError, size_t locu s = 0)
56 : m_status(static_cast<unsigned>(status))
57 , m_locus(checkLocus(locus))
58 {
59 ASSERT(this->status() == status);
60 }
61
62 SVGParseStatus status() const { return static_cast<SVGParseStatus>(m_status) ; }
63
64 bool hasLocus() const { return m_locus != kNoLocus; }
65 unsigned locus() const { return m_locus; }
66
67 // Generates a string describing this error for |value| in the context of
68 // an <element, attribute>-name pair.
69 String format(const String& tagName, const QualifiedName&, const AtomicStrin g& value) const;
70
71 private:
72 static const int kLocusBits = 24;
73 static const unsigned kNoLocus = (1u << kLocusBits) - 1;
74
75 static unsigned checkLocus(size_t locus)
76 {
77 // Clamp to fit in the number of bits available. If the character index
78 // encoded by the locus does not fit in the number of bits allocated
79 // for it, the locus will be disabled (set to kNoLocus). This means
80 // that very long values will be output in their entirety. That should
81 // however be rather uncommon.
82 return clampTo<unsigned>(locus, 0, kNoLocus);
83 }
84
85 unsigned m_status : 8;
86 unsigned m_locus : kLocusBits; // The locus (character index) of the error w ithin the parsed string.
87 };
88
89 inline bool operator==(const SVGParsingError& error, SVGParseStatus status)
90 {
91 return error.status() == status;
92 }
93 inline bool operator!=(const SVGParsingError& error, SVGParseStatus status) { re turn !(error == status); }
94
38 } // namespace blink 95 } // namespace blink
39 96
40 #endif // SVGParsingError_h 97 #endif // SVGParsingError_h
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/svg/SVGNumberOptionalNumber.cpp ('k') | third_party/WebKit/Source/core/svg/SVGParsingError.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698