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

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

Issue 1636503003: Error reporting for SVGLength and SVGLengthList (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: TestExpectations Created 4 years, 11 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 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 124 matching lines...) Expand 10 before | Expand all | Expand 10 after
135 SVGParsingError SVGLength::setValueAsString(const String& string) 135 SVGParsingError SVGLength::setValueAsString(const String& string)
136 { 136 {
137 if (string.isEmpty()) { 137 if (string.isEmpty()) {
138 m_value = cssValuePool().createValue(0, CSSPrimitiveValue::UnitType::Use rUnits); 138 m_value = cssValuePool().createValue(0, CSSPrimitiveValue::UnitType::Use rUnits);
139 return SVGParseStatus::NoError; 139 return SVGParseStatus::NoError;
140 } 140 }
141 141
142 CSSParserContext svgParserContext(SVGAttributeMode, 0); 142 CSSParserContext svgParserContext(SVGAttributeMode, 0);
143 RefPtrWillBeRawPtr<CSSValue> parsed = CSSParser::parseSingleValue(CSSPropert yX, string, svgParserContext); 143 RefPtrWillBeRawPtr<CSSValue> parsed = CSSParser::parseSingleValue(CSSPropert yX, string, svgParserContext);
144 if (!parsed || !parsed->isPrimitiveValue()) 144 if (!parsed || !parsed->isPrimitiveValue())
145 return SVGParseStatus::ParsingFailed; 145 return SVGParseStatus::ExpectedLength;
146 146
147 CSSPrimitiveValue* newValue = toCSSPrimitiveValue(parsed.get()); 147 CSSPrimitiveValue* newValue = toCSSPrimitiveValue(parsed.get());
148 // TODO(fs): Enable calc for SVG lengths 148 // TODO(fs): Enable calc for SVG lengths
149 if (newValue->isCalculated() || !isSupportedCSSUnitType(newValue->typeWithCa lcResolved())) 149 if (newValue->isCalculated() || !isSupportedCSSUnitType(newValue->typeWithCa lcResolved()))
150 return SVGParseStatus::ParsingFailed; 150 return SVGParseStatus::ExpectedLength;
151 151
152 m_value = newValue; 152 m_value = newValue;
153 return SVGParseStatus::NoError; 153 return SVGParseStatus::NoError;
154 } 154 }
155 155
156 String SVGLength::valueAsString() const 156 String SVGLength::valueAsString() const
157 { 157 {
158 return m_value->customCSSText(); 158 return m_value->customCSSText();
159 } 159 }
160 160
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
262 262
263 float SVGLength::calculateDistance(PassRefPtrWillBeRawPtr<SVGPropertyBase> toVal ue, SVGElement* contextElement) 263 float SVGLength::calculateDistance(PassRefPtrWillBeRawPtr<SVGPropertyBase> toVal ue, SVGElement* contextElement)
264 { 264 {
265 SVGLengthContext lengthContext(contextElement); 265 SVGLengthContext lengthContext(contextElement);
266 RefPtrWillBeRawPtr<SVGLength> toLength = toSVGLength(toValue); 266 RefPtrWillBeRawPtr<SVGLength> toLength = toSVGLength(toValue);
267 267
268 return fabsf(toLength->value(lengthContext) - value(lengthContext)); 268 return fabsf(toLength->value(lengthContext) - value(lengthContext));
269 } 269 }
270 270
271 } // namespace blink 271 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/LayoutTests/TestExpectations ('k') | third_party/WebKit/Source/core/svg/SVGLengthList.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698