| 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 5262 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5273 while (true) { | 5273 while (true) { |
| 5274 CSSParserValue* currentValue = m_valueList->current(); | 5274 CSSParserValue* currentValue = m_valueList->current(); |
| 5275 if (!currentValue || currentValue->unit != CSSPrimitiveValue::CSS_IDENT) | 5275 if (!currentValue || currentValue->unit != CSSPrimitiveValue::CSS_IDENT) |
| 5276 return nullptr; | 5276 return nullptr; |
| 5277 | 5277 |
| 5278 CSSPropertyID property = cssPropertyID(currentValue->string); | 5278 CSSPropertyID property = cssPropertyID(currentValue->string); |
| 5279 if (property) { | 5279 if (property) { |
| 5280 ASSERT(CSSPropertyMetadata::isEnabledProperty(property)); | 5280 ASSERT(CSSPropertyMetadata::isEnabledProperty(property)); |
| 5281 // Now "all" is used by both CSSValue and CSSPropertyValue. | 5281 // Now "all" is used by both CSSValue and CSSPropertyValue. |
| 5282 // Need to return nullptr when currentValue is CSSPropertyAll. | 5282 // Need to return nullptr when currentValue is CSSPropertyAll. |
| 5283 if (property == CSSPropertyWillChange || property == CSSPropertyAll) | 5283 if (property == CSSPropertyWillChange) |
| 5284 return nullptr; | 5284 return nullptr; |
| 5285 values->append(cssValuePool().createIdentifierValue(property)); | 5285 values->append(cssValuePool().createIdentifierValue(property)); |
| 5286 } else { | 5286 } else { |
| 5287 switch (currentValue->id) { | 5287 switch (currentValue->id) { |
| 5288 case CSSValueNone: | 5288 case CSSValueNone: |
| 5289 case CSSValueAll: | 5289 case CSSValueAll: |
| 5290 case CSSValueAuto: | 5290 case CSSValueAuto: |
| 5291 case CSSValueDefault: | 5291 case CSSValueDefault: |
| 5292 case CSSValueInitial: | 5292 case CSSValueInitial: |
| 5293 case CSSValueInherit: | 5293 case CSSValueInherit: |
| (...skipping 738 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 6032 || equalIgnoringCase(token, "n") || equalIgnoringCase(token, "-n"); | 6032 || equalIgnoringCase(token, "n") || equalIgnoringCase(token, "-n"); |
| 6033 } | 6033 } |
| 6034 | 6034 |
| 6035 bool CSSPropertyParser::isSystemColor(int id) | 6035 bool CSSPropertyParser::isSystemColor(int id) |
| 6036 { | 6036 { |
| 6037 // FIXME(sky): remove | 6037 // FIXME(sky): remove |
| 6038 return false; | 6038 return false; |
| 6039 } | 6039 } |
| 6040 | 6040 |
| 6041 } // namespace blink | 6041 } // namespace blink |
| OLD | NEW |