Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 Copyright (C) 2008 Eric Seidel <eric@webkit.org> | 2 Copyright (C) 2008 Eric Seidel <eric@webkit.org> |
| 3 Copyright (C) 2004, 2005, 2007 Nikolas Zimmermann <zimmermann@kde.org> | 3 Copyright (C) 2004, 2005, 2007 Nikolas Zimmermann <zimmermann@kde.org> |
| 4 2004, 2005, 2007, 2010 Rob Buis <buis@kde.org> | 4 2004, 2005, 2007, 2010 Rob Buis <buis@kde.org> |
| 5 Copyright (C) 2005, 2006 Apple Computer, Inc. | 5 Copyright (C) 2005, 2006 Apple Computer, Inc. |
| 6 | 6 |
| 7 This library is free software; you can redistribute it and/or | 7 This library is free software; you can redistribute it and/or |
| 8 modify it under the terms of the GNU Library General Public | 8 modify it under the terms of the GNU Library General Public |
| 9 License as published by the Free Software Foundation; either | 9 License as published by the Free Software Foundation; either |
| 10 version 2 of the License, or (at your option) any later version. | 10 version 2 of the License, or (at your option) any later version. |
| (...skipping 190 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 201 parsedValue = parseSVGPaint(); | 201 parsedValue = parseSVGPaint(); |
| 202 | 202 |
| 203 if (parsedValue) | 203 if (parsedValue) |
| 204 m_valueList->next(); | 204 m_valueList->next(); |
| 205 } | 205 } |
| 206 break; | 206 break; |
| 207 | 207 |
| 208 case CSSPropertyStopColor: // TODO : icccolor | 208 case CSSPropertyStopColor: // TODO : icccolor |
| 209 case CSSPropertyFloodColor: | 209 case CSSPropertyFloodColor: |
| 210 case CSSPropertyLightingColor: | 210 case CSSPropertyLightingColor: |
| 211 if ((id >= CSSValueAqua && id <= CSSValueWindowtext) || | 211 if ((id >= CSSValueActiveborder && id <= CSSValueWindowtext) || id == CS SValueMenu) |
|
pdr.
2013/05/02 17:41:08
These statements are very similar to the codepaths
| |
| 212 (id >= CSSValueAliceblue && id <= CSSValueYellowgreen)) | 212 parsedValue = SVGColor::createFromColor(RenderTheme::defaultTheme()- >systemColor(id)); |
| 213 else if ((id >= CSSValueAqua && id <= CSSValueTransparent) || | |
| 214 (id >= CSSValueAliceblue && id <= CSSValueYellowgreen) || id == CSSValueGrey) | |
| 213 parsedValue = SVGColor::createFromString(value->string); | 215 parsedValue = SVGColor::createFromString(value->string); |
| 214 else if (id == CSSValueCurrentcolor) | 216 else if (id == CSSValueCurrentcolor) |
| 215 parsedValue = SVGColor::createCurrentColor(); | 217 parsedValue = SVGColor::createCurrentColor(); |
| 216 else // TODO : svgcolor (iccColor) | 218 else // TODO : svgcolor (iccColor) |
| 217 parsedValue = parseSVGColor(); | 219 parsedValue = parseSVGColor(); |
| 218 | 220 |
| 219 if (parsedValue) | 221 if (parsedValue) |
| 220 m_valueList->next(); | 222 m_valueList->next(); |
| 221 | 223 |
| 222 break; | 224 break; |
| (...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 361 { | 363 { |
| 362 RGBA32 c = Color::transparent; | 364 RGBA32 c = Color::transparent; |
| 363 if (!parseColorFromValue(m_valueList->current(), c)) | 365 if (!parseColorFromValue(m_valueList->current(), c)) |
| 364 return 0; | 366 return 0; |
| 365 return SVGColor::createFromColor(Color(c)); | 367 return SVGColor::createFromColor(Color(c)); |
| 366 } | 368 } |
| 367 | 369 |
| 368 } | 370 } |
| 369 | 371 |
| 370 #endif // ENABLE(SVG) | 372 #endif // ENABLE(SVG) |
| OLD | NEW |