Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * Copyright (C) 2004, 2005, 2007, 2008 Nikolas Zimmermann <zimmermann@kde.org> | 2 * Copyright (C) 2004, 2005, 2007, 2008 Nikolas Zimmermann <zimmermann@kde.org> |
| 3 * Copyright (C) 2004, 2005, 2006 Rob Buis <buis@kde.org> | 3 * Copyright (C) 2004, 2005, 2006 Rob Buis <buis@kde.org> |
| 4 * Copyright (C) Research In Motion Limited 2010. All rights reserved. | 4 * Copyright (C) Research In Motion Limited 2010. 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 139 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 150 { | 150 { |
| 151 // If there's no unit given, the angle type is unspecified. | 151 // If there's no unit given, the angle type is unspecified. |
| 152 if (ptr == end) | 152 if (ptr == end) |
| 153 return SVGAngle::SVG_ANGLETYPE_UNSPECIFIED; | 153 return SVGAngle::SVG_ANGLETYPE_UNSPECIFIED; |
| 154 | 154 |
| 155 const CharType firstChar = *ptr; | 155 const CharType firstChar = *ptr; |
| 156 | 156 |
| 157 // If the unit contains only one character, the angle type is unknown. | 157 // If the unit contains only one character, the angle type is unknown. |
| 158 ++ptr; | 158 ++ptr; |
| 159 if (ptr == end) | 159 if (ptr == end) |
| 160 return SVGAngle::SVG_ANGLETYPE_UNKNOWN; | 160 return isSVGSpace(firstChar) ? SVGAngle::SVG_ANGLETYPE_UNSPECIFIED : SVG Angle::SVG_ANGLETYPE_UNKNOWN; |
| 161 | 161 |
| 162 const CharType secondChar = *ptr; | 162 const CharType secondChar = *ptr; |
| 163 | 163 |
| 164 // If the unit contains only two characters, the angle type is unknown. | 164 // If the unit contains only two characters, the angle type is unknown. |
| 165 ++ptr; | 165 ++ptr; |
| 166 if (ptr == end) | 166 if (ptr == end) |
| 167 return SVGAngle::SVG_ANGLETYPE_UNKNOWN; | 167 return isSVGSpace(firstChar) && isSVGSpace(secondChar) ? SVGAngle::SVG_A NGLETYPE_UNSPECIFIED : SVGAngle::SVG_ANGLETYPE_UNKNOWN; |
| 168 | 168 |
| 169 const CharType thirdChar = *ptr; | 169 const CharType thirdChar = *ptr; |
| 170 if (firstChar == 'd' && secondChar == 'e' && thirdChar == 'g') | 170 if (firstChar == 'd' && secondChar == 'e' && thirdChar == 'g') |
| 171 return SVGAngle::SVG_ANGLETYPE_DEG; | 171 return SVGAngle::SVG_ANGLETYPE_DEG; |
| 172 if (firstChar == 'r' && secondChar == 'a' && thirdChar == 'd') | 172 if (firstChar == 'r' && secondChar == 'a' && thirdChar == 'd') |
| 173 return SVGAngle::SVG_ANGLETYPE_RAD; | 173 return SVGAngle::SVG_ANGLETYPE_RAD; |
| 174 | 174 |
| 175 // If the unit contains three characters, but is not deg or rad, then it's u nknown. | 175 // If the unit contains three characters, but is not deg or rad, then it's u nknown. |
|
pdr.
2014/06/02 14:35:19
Can you update these comments to say something lik
Erik Dahlström (inactive)
2014/06/04 16:25:43
I went with a rewrite to hopefully make it more cl
| |
| 176 ++ptr; | 176 ++ptr; |
| 177 if (ptr == end) | 177 if (ptr == end) |
| 178 return SVGAngle::SVG_ANGLETYPE_UNKNOWN; | 178 return isSVGSpace(firstChar) && isSVGSpace(secondChar) && isSVGSpace(thi rdChar) ? SVGAngle::SVG_ANGLETYPE_UNSPECIFIED : SVGAngle::SVG_ANGLETYPE_UNKNOWN; |
| 179 | 179 |
| 180 const CharType fourthChar = *ptr; | 180 const CharType fourthChar = *ptr; |
| 181 | 181 |
| 182 if (firstChar == 'g' && secondChar == 'r' && thirdChar == 'a' && fourthChar == 'd') | 182 if (firstChar == 'g' && secondChar == 'r' && thirdChar == 'a' && fourthChar == 'd') |
| 183 return SVGAngle::SVG_ANGLETYPE_GRAD; | 183 return SVGAngle::SVG_ANGLETYPE_GRAD; |
| 184 if (firstChar == 't' && secondChar == 'u' && thirdChar == 'r' && fourthChar == 'n') | |
| 185 return SVGAngle::SVG_ANGLETYPE_TURN; | |
| 186 | |
| 187 if (isSVGSpace(firstChar) | |
| 188 && isSVGSpace(secondChar) | |
| 189 && isSVGSpace(thirdChar) | |
| 190 && isSVGSpace(fourthChar)) { | |
| 191 skipOptionalSVGSpaces(++ptr, end); | |
| 192 if (ptr == end) | |
| 193 return SVGAngle::SVG_ANGLETYPE_UNSPECIFIED; | |
| 194 } | |
| 184 | 195 |
| 185 return SVGAngle::SVG_ANGLETYPE_UNKNOWN; | 196 return SVGAngle::SVG_ANGLETYPE_UNKNOWN; |
| 186 } | 197 } |
| 187 | 198 |
| 188 String SVGAngle::valueAsString() const | 199 String SVGAngle::valueAsString() const |
| 189 { | 200 { |
| 190 switch (m_unitType) { | 201 switch (m_unitType) { |
| 191 case SVG_ANGLETYPE_DEG: { | 202 case SVG_ANGLETYPE_DEG: { |
| 192 DEFINE_STATIC_LOCAL(String, degString, ("deg")); | 203 DEFINE_STATIC_LOCAL(String, degString, ("deg")); |
| 193 return String::number(m_valueInSpecifiedUnits) + degString; | 204 return String::number(m_valueInSpecifiedUnits) + degString; |
| (...skipping 14 matching lines...) Expand all Loading... | |
| 208 ASSERT_NOT_REACHED(); | 219 ASSERT_NOT_REACHED(); |
| 209 return String(); | 220 return String(); |
| 210 } | 221 } |
| 211 | 222 |
| 212 template<typename CharType> | 223 template<typename CharType> |
| 213 static bool parseValue(const String& value, float& valueInSpecifiedUnits, SVGAng le::SVGAngleType& unitType) | 224 static bool parseValue(const String& value, float& valueInSpecifiedUnits, SVGAng le::SVGAngleType& unitType) |
| 214 { | 225 { |
| 215 const CharType* ptr = value.getCharacters<CharType>(); | 226 const CharType* ptr = value.getCharacters<CharType>(); |
| 216 const CharType* end = ptr + value.length(); | 227 const CharType* end = ptr + value.length(); |
| 217 | 228 |
| 218 if (!parseNumber(ptr, end, valueInSpecifiedUnits, false)) | 229 if (!parseNumber(ptr, end, valueInSpecifiedUnits, ALLOW_LEADING)) |
| 219 return false; | 230 return false; |
| 220 | 231 |
| 221 unitType = stringToAngleType(ptr, end); | 232 unitType = stringToAngleType(ptr, end); |
| 222 if (unitType == SVGAngle::SVG_ANGLETYPE_UNKNOWN) | 233 if (unitType == SVGAngle::SVG_ANGLETYPE_UNKNOWN) |
| 223 return false; | 234 return false; |
| 224 | 235 |
| 225 return true; | 236 return true; |
| 226 } | 237 } |
| 227 | 238 |
| 228 void SVGAngle::setValueAsString(const String& value, ExceptionState& exceptionSt ate) | 239 void SVGAngle::setValueAsString(const String& value, ExceptionState& exceptionSt ate) |
| (...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 397 | 408 |
| 398 void SVGAngle::orientTypeChanged() | 409 void SVGAngle::orientTypeChanged() |
| 399 { | 410 { |
| 400 if (orientType()->enumValue() == SVGMarkerOrientAuto) { | 411 if (orientType()->enumValue() == SVGMarkerOrientAuto) { |
| 401 m_unitType = SVG_ANGLETYPE_UNSPECIFIED; | 412 m_unitType = SVG_ANGLETYPE_UNSPECIFIED; |
| 402 m_valueInSpecifiedUnits = 0; | 413 m_valueInSpecifiedUnits = 0; |
| 403 } | 414 } |
| 404 } | 415 } |
| 405 | 416 |
| 406 } | 417 } |
| OLD | NEW |