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

Side by Side Diff: third_party/WebKit/Source/core/svg/SVGPath.cpp

Issue 1544673003: Refactor propagation of parsing errors for SVG attributes (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 12 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) 2004, 2005, 2006, 2007, 2008 Nikolas Zimmermann <zimmermann@kde .org> 2 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Nikolas Zimmermann <zimmermann@kde .org>
3 * Copyright (C) 2004, 2005 Rob Buis <buis@kde.org> 3 * Copyright (C) 2004, 2005 Rob Buis <buis@kde.org>
4 * Copyright (C) 2007 Eric Seidel <eric@webkit.org> 4 * Copyright (C) 2007 Eric Seidel <eric@webkit.org>
5 * Copyright (C) Research In Motion Limited 2010. All rights reserved. 5 * Copyright (C) Research In Motion Limited 2010. All rights reserved.
6 * 6 *
7 * This library is free software; you can redistribute it and/or 7 * This library is free software; you can redistribute it and/or
8 * modify it under the terms of the GNU Library General Public 8 * modify it under the terms of the GNU Library General Public
9 * License as published by the Free Software Foundation; either 9 * License as published by the Free Software Foundation; either
10 * version 2 of the License, or (at your option) any later version. 10 * version 2 of the License, or (at your option) any later version.
11 * 11 *
12 * This library is distributed in the hope that it will be useful, 12 * This library is distributed in the hope that it will be useful,
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of 13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
15 * Library General Public License for more details. 15 * Library General Public License for more details.
16 * 16 *
17 * You should have received a copy of the GNU Library General Public License 17 * You should have received a copy of the GNU Library General Public License
18 * along with this library; see the file COPYING.LIB. If not, write to 18 * along with this library; see the file COPYING.LIB. If not, write to
19 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 19 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
20 * Boston, MA 02110-1301, USA. 20 * Boston, MA 02110-1301, USA.
21 */ 21 */
22 22
23 #include "core/svg/SVGPath.h" 23 #include "core/svg/SVGPath.h"
24 24
25 #include "bindings/core/v8/ExceptionState.h"
26 #include "core/SVGNames.h" 25 #include "core/SVGNames.h"
27 #include "core/svg/SVGAnimationElement.h" 26 #include "core/svg/SVGAnimationElement.h"
28 #include "core/svg/SVGPathBlender.h" 27 #include "core/svg/SVGPathBlender.h"
29 #include "core/svg/SVGPathByteStream.h" 28 #include "core/svg/SVGPathByteStream.h"
30 #include "core/svg/SVGPathByteStreamBuilder.h" 29 #include "core/svg/SVGPathByteStreamBuilder.h"
31 #include "core/svg/SVGPathByteStreamSource.h" 30 #include "core/svg/SVGPathByteStreamSource.h"
32 #include "core/svg/SVGPathUtilities.h" 31 #include "core/svg/SVGPathUtilities.h"
33 #include "platform/graphics/Path.h" 32 #include "platform/graphics/Path.h"
34 33
35 namespace blink { 34 namespace blink {
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
87 { 86 {
88 return m_pathValue->pathString(); 87 return m_pathValue->pathString();
89 } 88 }
90 89
91 90
92 PassRefPtrWillBeRawPtr<SVGPath> SVGPath::clone() const 91 PassRefPtrWillBeRawPtr<SVGPath> SVGPath::clone() const
93 { 92 {
94 return SVGPath::create(m_pathValue); 93 return SVGPath::create(m_pathValue);
95 } 94 }
96 95
97 96 SVGParsingError SVGPath::setValueAsString(const String& string)
98 void SVGPath::setValueAsString(const String& string, ExceptionState& exceptionSt ate)
99 { 97 {
98 SVGParsingError parseStatus = NoError;
100 OwnPtr<SVGPathByteStream> byteStream = SVGPathByteStream::create(); 99 OwnPtr<SVGPathByteStream> byteStream = SVGPathByteStream::create();
101 if (!buildByteStreamFromString(string, *byteStream)) 100 if (!buildByteStreamFromString(string, *byteStream))
102 exceptionState.throwDOMException(SyntaxError, "Problem parsing path \"" + string + "\""); 101 parseStatus = ParsingAttributeFailedError;
103 m_pathValue = CSSPathValue::create(byteStream.release()); 102 m_pathValue = CSSPathValue::create(byteStream.release());
103 return parseStatus;
104 } 104 }
105 105
106 PassRefPtrWillBeRawPtr<SVGPropertyBase> SVGPath::cloneForAnimation(const String& value) const 106 PassRefPtrWillBeRawPtr<SVGPropertyBase> SVGPath::cloneForAnimation(const String& value) const
107 { 107 {
108 return SVGPath::create(CSSPathValue::create(value)); 108 return SVGPath::create(CSSPathValue::create(value));
109 } 109 }
110 110
111 void SVGPath::add(PassRefPtrWillBeRawPtr<SVGPropertyBase> other, SVGElement*) 111 void SVGPath::add(PassRefPtrWillBeRawPtr<SVGPropertyBase> other, SVGElement*)
112 { 112 {
113 const SVGPathByteStream& otherPathByteStream = toSVGPath(other)->byteStream( ); 113 const SVGPathByteStream& otherPathByteStream = toSVGPath(other)->byteStream( );
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
172 return -1; 172 return -1;
173 } 173 }
174 174
175 DEFINE_TRACE(SVGPath) 175 DEFINE_TRACE(SVGPath)
176 { 176 {
177 visitor->trace(m_pathValue); 177 visitor->trace(m_pathValue);
178 SVGPropertyBase::trace(visitor); 178 SVGPropertyBase::trace(visitor);
179 } 179 }
180 180
181 } 181 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698