| OLD | NEW |
| 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 8304 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 8315 } | 8315 } |
| 8316 | 8316 |
| 8317 if (parsedValue) | 8317 if (parsedValue) |
| 8318 m_valueList->next(); | 8318 m_valueList->next(); |
| 8319 } | 8319 } |
| 8320 break; | 8320 break; |
| 8321 | 8321 |
| 8322 case CSSPropertyStopColor: // TODO : icccolor | 8322 case CSSPropertyStopColor: // TODO : icccolor |
| 8323 case CSSPropertyFloodColor: | 8323 case CSSPropertyFloodColor: |
| 8324 case CSSPropertyLightingColor: | 8324 case CSSPropertyLightingColor: |
| 8325 if (isSystemColor(id)) { | 8325 if (isSystemColor(id)) |
| 8326 parsedValue = cssValuePool().createColorValue(RenderTheme::theme().s
ystemColor(id).rgb()); | 8326 parsedValue = cssValuePool().createColorValue(RenderTheme::theme().s
ystemColor(id).rgb()); |
| 8327 } else if ((id >= CSSValueAqua && id <= CSSValueTransparent) | 8327 else if (id == CSSValueCurrentcolor) |
| 8328 || (id >= CSSValueAliceblue && id <= CSSValueYellowgreen) || id == C
SSValueGrey) { | |
| 8329 StyleColor styleColor = BisonCSSParser::colorFromRGBColorString(valu
e->string); | |
| 8330 ASSERT(!styleColor.isCurrentColor()); | |
| 8331 parsedValue = cssValuePool().createColorValue(styleColor.color().rgb
()); | |
| 8332 } else if (id == CSSValueCurrentcolor) { | |
| 8333 parsedValue = cssValuePool().createIdentifierValue(id); | 8328 parsedValue = cssValuePool().createIdentifierValue(id); |
| 8334 } else { // TODO : svgcolor (iccColor) | 8329 else // TODO : svgcolor (iccColor) |
| 8335 parsedValue = parseColor(); | 8330 parsedValue = parseColor(); |
| 8336 } | |
| 8337 | 8331 |
| 8338 if (parsedValue) | 8332 if (parsedValue) |
| 8339 m_valueList->next(); | 8333 m_valueList->next(); |
| 8340 | 8334 |
| 8341 break; | 8335 break; |
| 8342 | 8336 |
| 8343 case CSSPropertyPaintOrder: | 8337 case CSSPropertyPaintOrder: |
| 8344 if (m_valueList->size() == 1 && id == CSSValueNormal) | 8338 if (m_valueList->size() == 1 && id == CSSValueNormal) |
| 8345 validPrimitive = true; | 8339 validPrimitive = true; |
| 8346 else if ((parsedValue = parsePaintOrder())) | 8340 else if ((parsedValue = parsePaintOrder())) |
| (...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 8503 parsedValues->append(CSSPrimitiveValue::createIdentifier(CSSValueFill)); | 8497 parsedValues->append(CSSPrimitiveValue::createIdentifier(CSSValueFill)); |
| 8504 if (!seenStroke) | 8498 if (!seenStroke) |
| 8505 parsedValues->append(CSSPrimitiveValue::createIdentifier(CSSValueStroke)
); | 8499 parsedValues->append(CSSPrimitiveValue::createIdentifier(CSSValueStroke)
); |
| 8506 if (!seenMarkers) | 8500 if (!seenMarkers) |
| 8507 parsedValues->append(CSSPrimitiveValue::createIdentifier(CSSValueMarkers
)); | 8501 parsedValues->append(CSSPrimitiveValue::createIdentifier(CSSValueMarkers
)); |
| 8508 | 8502 |
| 8509 return parsedValues.release(); | 8503 return parsedValues.release(); |
| 8510 } | 8504 } |
| 8511 | 8505 |
| 8512 } // namespace WebCore | 8506 } // namespace WebCore |
| OLD | NEW |