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

Unified Diff: Source/core/css/parser/CSSPropertyParser.cpp

Issue 392013002: Cleanup SVG color parsing handling (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Move luminance as well Created 6 years, 5 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/css/SVGCSSValueKeywords.in ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/css/parser/CSSPropertyParser.cpp
diff --git a/Source/core/css/parser/CSSPropertyParser.cpp b/Source/core/css/parser/CSSPropertyParser.cpp
index ad787dec40fc511232af9a366bee5f9218563ac9..b1c38e7488cb82bd9722c130f1a38c4aa51d2e05 100644
--- a/Source/core/css/parser/CSSPropertyParser.cpp
+++ b/Source/core/css/parser/CSSPropertyParser.cpp
@@ -8322,18 +8322,12 @@ bool CSSPropertyParser::parseSVGValue(CSSPropertyID propId, bool important)
case CSSPropertyStopColor: // TODO : icccolor
case CSSPropertyFloodColor:
case CSSPropertyLightingColor:
- if (isSystemColor(id)) {
+ if (isSystemColor(id))
parsedValue = cssValuePool().createColorValue(RenderTheme::theme().systemColor(id).rgb());
- } else if ((id >= CSSValueAqua && id <= CSSValueTransparent)
- || (id >= CSSValueAliceblue && id <= CSSValueYellowgreen) || id == CSSValueGrey) {
- StyleColor styleColor = BisonCSSParser::colorFromRGBColorString(value->string);
- ASSERT(!styleColor.isCurrentColor());
- parsedValue = cssValuePool().createColorValue(styleColor.color().rgb());
- } else if (id == CSSValueCurrentcolor) {
+ else if (id == CSSValueCurrentcolor)
parsedValue = cssValuePool().createIdentifierValue(id);
- } else { // TODO : svgcolor (iccColor)
+ else // TODO : svgcolor (iccColor)
parsedValue = parseColor();
- }
if (parsedValue)
m_valueList->next();
« no previous file with comments | « Source/core/css/SVGCSSValueKeywords.in ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698