| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2004, 2005, 2006 Nikolas Zimmermann <zimmermann@kde.org> | 2 * Copyright (C) 2004, 2005, 2006 Nikolas Zimmermann <zimmermann@kde.org> |
| 3 * Copyright (C) 2004, 2005, 2006, 2007 Rob Buis <buis@kde.org> | 3 * Copyright (C) 2004, 2005, 2006, 2007 Rob Buis <buis@kde.org> |
| 4 * Copyright (C) 2007 Apple Inc. All rights reserved. | 4 * Copyright (C) 2007 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 * |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 56 PassRefPtrWillBeRawPtr<SVGLength> SVGLength::clone() const | 56 PassRefPtrWillBeRawPtr<SVGLength> SVGLength::clone() const |
| 57 { | 57 { |
| 58 return adoptRefWillBeNoop(new SVGLength(*this)); | 58 return adoptRefWillBeNoop(new SVGLength(*this)); |
| 59 } | 59 } |
| 60 | 60 |
| 61 PassRefPtrWillBeRawPtr<SVGPropertyBase> SVGLength::cloneForAnimation(const Strin
g& value) const | 61 PassRefPtrWillBeRawPtr<SVGPropertyBase> SVGLength::cloneForAnimation(const Strin
g& value) const |
| 62 { | 62 { |
| 63 RefPtrWillBeRawPtr<SVGLength> length = create(); | 63 RefPtrWillBeRawPtr<SVGLength> length = create(); |
| 64 length->m_unitMode = m_unitMode; | 64 length->m_unitMode = m_unitMode; |
| 65 | 65 |
| 66 SVGParsingError status = length->setValueAsString(value); | 66 if (length->setValueAsString(value) != SVGParseStatus::NoError) |
| 67 if (status != NoError) | |
| 68 length->m_value = cssValuePool().createValue(0, CSSPrimitiveValue::UnitT
ype::UserUnits); | 67 length->m_value = cssValuePool().createValue(0, CSSPrimitiveValue::UnitT
ype::UserUnits); |
| 69 | 68 |
| 70 return length.release(); | 69 return length.release(); |
| 71 } | 70 } |
| 72 | 71 |
| 73 bool SVGLength::operator==(const SVGLength& other) const | 72 bool SVGLength::operator==(const SVGLength& other) const |
| 74 { | 73 { |
| 75 return m_unitMode == other.m_unitMode && m_value == other.m_value; | 74 return m_unitMode == other.m_unitMode && m_value == other.m_value; |
| 76 } | 75 } |
| 77 | 76 |
| (...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 130 // Delaying division by 100 as long as possible since it introduces floa
ting point errors. | 129 // Delaying division by 100 as long as possible since it introduces floa
ting point errors. |
| 131 result = result / 100; | 130 result = result / 100; |
| 132 } | 131 } |
| 133 return result; | 132 return result; |
| 134 } | 133 } |
| 135 | 134 |
| 136 SVGParsingError SVGLength::setValueAsString(const String& string) | 135 SVGParsingError SVGLength::setValueAsString(const String& string) |
| 137 { | 136 { |
| 138 if (string.isEmpty()) { | 137 if (string.isEmpty()) { |
| 139 m_value = cssValuePool().createValue(0, CSSPrimitiveValue::UnitType::Use
rUnits); | 138 m_value = cssValuePool().createValue(0, CSSPrimitiveValue::UnitType::Use
rUnits); |
| 140 return NoError; | 139 return SVGParseStatus::NoError; |
| 141 } | 140 } |
| 142 | 141 |
| 143 CSSParserContext svgParserContext(SVGAttributeMode, 0); | 142 CSSParserContext svgParserContext(SVGAttributeMode, 0); |
| 144 RefPtrWillBeRawPtr<CSSValue> parsed = CSSParser::parseSingleValue(CSSPropert
yX, string, svgParserContext); | 143 RefPtrWillBeRawPtr<CSSValue> parsed = CSSParser::parseSingleValue(CSSPropert
yX, string, svgParserContext); |
| 145 if (!parsed || !parsed->isPrimitiveValue()) | 144 if (!parsed || !parsed->isPrimitiveValue()) |
| 146 return ParsingAttributeFailedError; | 145 return SVGParseStatus::ParsingFailed; |
| 147 | 146 |
| 148 CSSPrimitiveValue* newValue = toCSSPrimitiveValue(parsed.get()); | 147 CSSPrimitiveValue* newValue = toCSSPrimitiveValue(parsed.get()); |
| 149 // TODO(fs): Enable calc for SVG lengths | 148 // TODO(fs): Enable calc for SVG lengths |
| 150 if (newValue->isCalculated() || !isSupportedCSSUnitType(newValue->typeWithCa
lcResolved())) | 149 if (newValue->isCalculated() || !isSupportedCSSUnitType(newValue->typeWithCa
lcResolved())) |
| 151 return ParsingAttributeFailedError; | 150 return SVGParseStatus::ParsingFailed; |
| 152 | 151 |
| 153 m_value = newValue; | 152 m_value = newValue; |
| 154 return NoError; | 153 return SVGParseStatus::NoError; |
| 155 } | 154 } |
| 156 | 155 |
| 157 String SVGLength::valueAsString() const | 156 String SVGLength::valueAsString() const |
| 158 { | 157 { |
| 159 return m_value->customCSSText(); | 158 return m_value->customCSSText(); |
| 160 } | 159 } |
| 161 | 160 |
| 162 void SVGLength::newValueSpecifiedUnits(CSSPrimitiveValue::UnitType type, float v
alue) | 161 void SVGLength::newValueSpecifiedUnits(CSSPrimitiveValue::UnitType type, float v
alue) |
| 163 { | 162 { |
| 164 m_value = CSSPrimitiveValue::create(value, type); | 163 m_value = CSSPrimitiveValue::create(value, type); |
| (...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 263 | 262 |
| 264 float SVGLength::calculateDistance(PassRefPtrWillBeRawPtr<SVGPropertyBase> toVal
ue, SVGElement* contextElement) | 263 float SVGLength::calculateDistance(PassRefPtrWillBeRawPtr<SVGPropertyBase> toVal
ue, SVGElement* contextElement) |
| 265 { | 264 { |
| 266 SVGLengthContext lengthContext(contextElement); | 265 SVGLengthContext lengthContext(contextElement); |
| 267 RefPtrWillBeRawPtr<SVGLength> toLength = toSVGLength(toValue); | 266 RefPtrWillBeRawPtr<SVGLength> toLength = toSVGLength(toValue); |
| 268 | 267 |
| 269 return fabsf(toLength->value(lengthContext) - value(lengthContext)); | 268 return fabsf(toLength->value(lengthContext) - value(lengthContext)); |
| 270 } | 269 } |
| 271 | 270 |
| 272 } | 271 } |
| OLD | NEW |