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

Side by Side Diff: third_party/WebKit/Source/core/svg/SVGAnimatedLength.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) 2014 Google Inc. All rights reserved. 2 * Copyright (C) 2014 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * 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 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 12 matching lines...) Expand all
23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29 */ 29 */
30 30
31 #include "core/svg/SVGAnimatedLength.h" 31 #include "core/svg/SVGAnimatedLength.h"
32 32
33 #include "core/svg/SVGElement.h"
34 #include "core/svg/SVGLength.h" 33 #include "core/svg/SVGLength.h"
35 34
36 namespace blink { 35 namespace blink {
37 36
38 void SVGAnimatedLength::setDefaultValueAsString(const String& value) 37 void SVGAnimatedLength::setDefaultValueAsString(const String& value)
39 { 38 {
40 baseValue()->setValueAsString(value, ASSERT_NO_EXCEPTION); 39 baseValue()->setValueAsString(value);
41 } 40 }
42 41
43 void SVGAnimatedLength::setBaseValueAsString(const String& value, SVGParsingErro r& parseError) 42 SVGParsingError SVGAnimatedLength::setBaseValueAsString(const String& value)
44 { 43 {
45 TrackExceptionState es; 44 SVGParsingError parseStatus = baseValue()->setValueAsString(value);
46 45
47 baseValue()->setValueAsString(value, es); 46 if (parseStatus != NoError)
47 baseValue()->newValueSpecifiedUnits(CSSPrimitiveValue::UnitType::UserUni ts, 0);
48 else if (SVGLength::negativeValuesForbiddenForAnimatedLengthAttribute(attrib uteName()) && baseValue()->valueInSpecifiedUnits() < 0)
49 parseStatus = NegativeValueForbiddenError;
48 50
49 if (es.hadException()) { 51 return parseStatus;
50 parseError = ParsingAttributeFailedError;
51 baseValue()->newValueSpecifiedUnits(CSSPrimitiveValue::UnitType::UserUni ts, 0);
52 } else if (SVGLength::negativeValuesForbiddenForAnimatedLengthAttribute(attr ibuteName()) && baseValue()->valueInSpecifiedUnits() < 0) {
53 parseError = NegativeValueForbiddenError;
54 }
55 } 52 }
56 53
57 } 54 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698