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

Side by Side 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: Add alpha change 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2003 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 2003 Lars Knoll (knoll@kde.org)
3 * Copyright (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com) 3 * Copyright (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com)
4 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved. 4 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved.
5 * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com> 5 * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com>
6 * Copyright (C) 2008 Eric Seidel <eric@webkit.org> 6 * Copyright (C) 2008 Eric Seidel <eric@webkit.org>
7 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/) 7 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/)
8 * Copyright (C) 2012 Adobe Systems Incorporated. All rights reserved. 8 * Copyright (C) 2012 Adobe Systems Incorporated. All rights reserved.
9 * Copyright (C) 2012 Intel Corporation. All rights reserved. 9 * Copyright (C) 2012 Intel Corporation. All rights reserved.
10 * 10 *
(...skipping 8297 matching lines...) Expand 10 before | Expand all | Expand 10 after
8308 } 8308 }
8309 8309
8310 if (parsedValue) 8310 if (parsedValue)
8311 m_valueList->next(); 8311 m_valueList->next();
8312 } 8312 }
8313 break; 8313 break;
8314 8314
8315 case CSSPropertyStopColor: // TODO : icccolor 8315 case CSSPropertyStopColor: // TODO : icccolor
8316 case CSSPropertyFloodColor: 8316 case CSSPropertyFloodColor:
8317 case CSSPropertyLightingColor: 8317 case CSSPropertyLightingColor:
8318 if (isSystemColor(id)) { 8318 if (isSystemColor(id))
8319 parsedValue = cssValuePool().createColorValue(RenderTheme::theme().s ystemColor(id).rgb()); 8319 parsedValue = cssValuePool().createColorValue(RenderTheme::theme().s ystemColor(id).rgb());
8320 } else if ((id >= CSSValueAqua && id <= CSSValueTransparent) 8320 else if (id == CSSValueCurrentcolor)
8321 || (id >= CSSValueAliceblue && id <= CSSValueYellowgreen) || id == C SSValueGrey) {
8322 StyleColor styleColor = BisonCSSParser::colorFromRGBColorString(valu e->string);
8323 ASSERT(!styleColor.isCurrentColor());
8324 parsedValue = cssValuePool().createColorValue(styleColor.color().rgb ());
8325 } else if (id == CSSValueCurrentcolor) {
8326 parsedValue = cssValuePool().createIdentifierValue(id); 8321 parsedValue = cssValuePool().createIdentifierValue(id);
8327 } else { // TODO : svgcolor (iccColor) 8322 else // TODO : svgcolor (iccColor)
8328 parsedValue = parseColor(); 8323 parsedValue = parseColor();
8329 }
8330 8324
8331 if (parsedValue) 8325 if (parsedValue)
8332 m_valueList->next(); 8326 m_valueList->next();
8333 8327
8334 break; 8328 break;
8335 8329
8336 case CSSPropertyPaintOrder: 8330 case CSSPropertyPaintOrder:
8337 if (m_valueList->size() == 1 && id == CSSValueNormal) 8331 if (m_valueList->size() == 1 && id == CSSValueNormal)
8338 validPrimitive = true; 8332 validPrimitive = true;
8339 else if ((parsedValue = parsePaintOrder())) 8333 else if ((parsedValue = parsePaintOrder()))
(...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after
8496 parsedValues->append(CSSPrimitiveValue::createIdentifier(CSSValueFill)); 8490 parsedValues->append(CSSPrimitiveValue::createIdentifier(CSSValueFill));
8497 if (!seenStroke) 8491 if (!seenStroke)
8498 parsedValues->append(CSSPrimitiveValue::createIdentifier(CSSValueStroke) ); 8492 parsedValues->append(CSSPrimitiveValue::createIdentifier(CSSValueStroke) );
8499 if (!seenMarkers) 8493 if (!seenMarkers)
8500 parsedValues->append(CSSPrimitiveValue::createIdentifier(CSSValueMarkers )); 8494 parsedValues->append(CSSPrimitiveValue::createIdentifier(CSSValueMarkers ));
8501 8495
8502 return parsedValues.release(); 8496 return parsedValues.release();
8503 } 8497 }
8504 8498
8505 } // namespace WebCore 8499 } // namespace WebCore
OLDNEW
« Source/core/css/SVGCSSValueKeywords.in ('K') | « Source/core/css/SVGCSSValueKeywords.in ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698