OLD | NEW |
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 16 matching lines...) Expand all Loading... |
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/SVGLength.h" | 33 #include "core/svg/SVGLength.h" |
34 | 34 |
35 namespace blink { | 35 namespace blink { |
36 | 36 |
| 37 void SVGAnimatedLength::setDefaultValue() |
| 38 { |
| 39 setDefaultValueAsString(m_defaultValue); |
| 40 } |
| 41 |
37 void SVGAnimatedLength::setDefaultValueAsString(const String& value) | 42 void SVGAnimatedLength::setDefaultValueAsString(const String& value) |
38 { | 43 { |
39 baseValue()->setValueAsString(value); | 44 baseValue()->setValueAsString(value); |
40 } | 45 } |
41 | 46 |
42 SVGParsingError SVGAnimatedLength::setBaseValueAsString(const String& value) | 47 SVGParsingError SVGAnimatedLength::setBaseValueAsString(const String& value) |
43 { | 48 { |
| 49 if (value.isNull()) { |
| 50 setDefaultValue(); |
| 51 return SVGParseStatus::NoError; |
| 52 } |
| 53 |
44 SVGParsingError parseStatus = baseValue()->setValueAsString(value); | 54 SVGParsingError parseStatus = baseValue()->setValueAsString(value); |
45 | 55 |
46 if (parseStatus != SVGParseStatus::NoError) | 56 if (parseStatus != SVGParseStatus::NoError) |
47 baseValue()->newValueSpecifiedUnits(CSSPrimitiveValue::UnitType::UserUni
ts, 0); | 57 setDefaultValue(); |
48 else if (SVGLength::negativeValuesForbiddenForAnimatedLengthAttribute(attrib
uteName()) && baseValue()->valueInSpecifiedUnits() < 0) | 58 else if (SVGLength::negativeValuesForbiddenForAnimatedLengthAttribute(attrib
uteName()) && baseValue()->valueInSpecifiedUnits() < 0) |
49 parseStatus = SVGParseStatus::NegativeValue; | 59 parseStatus = SVGParseStatus::NegativeValue; |
50 | 60 |
51 return parseStatus; | 61 return parseStatus; |
52 } | 62 } |
53 | 63 |
54 } // namespace blink | 64 } // namespace blink |
OLD | NEW |