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 122 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
133 return result; | 133 return result; |
134 } | 134 } |
135 | 135 |
136 SVGParsingError SVGLength::setValueAsString(const String& string) { | 136 SVGParsingError SVGLength::setValueAsString(const String& string) { |
137 if (string.isEmpty()) { | 137 if (string.isEmpty()) { |
138 m_value = | 138 m_value = |
139 CSSPrimitiveValue::create(0, CSSPrimitiveValue::UnitType::UserUnits); | 139 CSSPrimitiveValue::create(0, CSSPrimitiveValue::UnitType::UserUnits); |
140 return SVGParseStatus::NoError; | 140 return SVGParseStatus::NoError; |
141 } | 141 } |
142 | 142 |
143 CSSParserContext svgParserContext(SVGAttributeMode, nullptr); | 143 CSSParserContext* svgParserContext = |
| 144 CSSParserContext::create(SVGAttributeMode); |
144 const CSSValue* parsed = | 145 const CSSValue* parsed = |
145 CSSParser::parseSingleValue(CSSPropertyX, string, svgParserContext); | 146 CSSParser::parseSingleValue(CSSPropertyX, string, svgParserContext); |
146 if (!parsed || !parsed->isPrimitiveValue()) | 147 if (!parsed || !parsed->isPrimitiveValue()) |
147 return SVGParseStatus::ExpectedLength; | 148 return SVGParseStatus::ExpectedLength; |
148 | 149 |
149 const CSSPrimitiveValue* newValue = toCSSPrimitiveValue(parsed); | 150 const CSSPrimitiveValue* newValue = toCSSPrimitiveValue(parsed); |
150 if (!isSupportedCSSUnitType(newValue->typeWithCalcResolved())) | 151 if (!isSupportedCSSUnitType(newValue->typeWithCalcResolved())) |
151 return SVGParseStatus::ExpectedLength; | 152 return SVGParseStatus::ExpectedLength; |
152 | 153 |
153 m_value = newValue; | 154 m_value = newValue; |
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
267 | 268 |
268 float SVGLength::calculateDistance(SVGPropertyBase* toValue, | 269 float SVGLength::calculateDistance(SVGPropertyBase* toValue, |
269 SVGElement* contextElement) { | 270 SVGElement* contextElement) { |
270 SVGLengthContext lengthContext(contextElement); | 271 SVGLengthContext lengthContext(contextElement); |
271 SVGLength* toLength = toSVGLength(toValue); | 272 SVGLength* toLength = toSVGLength(toValue); |
272 | 273 |
273 return fabsf(toLength->value(lengthContext) - value(lengthContext)); | 274 return fabsf(toLength->value(lengthContext) - value(lengthContext)); |
274 } | 275 } |
275 | 276 |
276 } // namespace blink | 277 } // namespace blink |
OLD | NEW |