| 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 2304 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2315 allowComma = false; | 2315 allowComma = false; |
| 2316 } else { | 2316 } else { |
| 2317 allowComma = true; | 2317 allowComma = true; |
| 2318 switch (propId) { | 2318 switch (propId) { |
| 2319 case CSSPropertyBackgroundColor: | 2319 case CSSPropertyBackgroundColor: |
| 2320 currValue = parseBackgroundColor(); | 2320 currValue = parseBackgroundColor(); |
| 2321 if (currValue) | 2321 if (currValue) |
| 2322 m_valueList->next(); | 2322 m_valueList->next(); |
| 2323 break; | 2323 break; |
| 2324 case CSSPropertyBackgroundAttachment: | 2324 case CSSPropertyBackgroundAttachment: |
| 2325 if (val->id == CSSValueScroll || val->id == CSSValueFixed ||
val->id == CSSValueLocal) { | 2325 if (val->id == CSSValueFixed || val->id == CSSValueLocal) { |
| 2326 currValue = cssValuePool().createIdentifierValue(val->id
); | 2326 currValue = cssValuePool().createIdentifierValue(val->id
); |
| 2327 m_valueList->next(); | 2327 m_valueList->next(); |
| 2328 } | 2328 } |
| 2329 break; | 2329 break; |
| 2330 case CSSPropertyBackgroundImage: | 2330 case CSSPropertyBackgroundImage: |
| 2331 case CSSPropertyWebkitMaskImage: | 2331 case CSSPropertyWebkitMaskImage: |
| 2332 if (parseFillImage(m_valueList, currValue)) | 2332 if (parseFillImage(m_valueList, currValue)) |
| 2333 m_valueList->next(); | 2333 m_valueList->next(); |
| 2334 break; | 2334 break; |
| 2335 case CSSPropertyWebkitBackgroundClip: | 2335 case CSSPropertyWebkitBackgroundClip: |
| (...skipping 3026 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5362 } else { | 5362 } else { |
| 5363 switch (currentValue->id) { | 5363 switch (currentValue->id) { |
| 5364 case CSSValueNone: | 5364 case CSSValueNone: |
| 5365 case CSSValueAll: | 5365 case CSSValueAll: |
| 5366 case CSSValueAuto: | 5366 case CSSValueAuto: |
| 5367 case CSSValueDefault: | 5367 case CSSValueDefault: |
| 5368 case CSSValueInitial: | 5368 case CSSValueInitial: |
| 5369 case CSSValueInherit: | 5369 case CSSValueInherit: |
| 5370 return nullptr; | 5370 return nullptr; |
| 5371 case CSSValueContents: | 5371 case CSSValueContents: |
| 5372 case CSSValueScrollPosition: | |
| 5373 values->append(cssValuePool().createIdentifierValue(currentValue
->id)); | 5372 values->append(cssValuePool().createIdentifierValue(currentValue
->id)); |
| 5374 break; | 5373 break; |
| 5375 default: | 5374 default: |
| 5376 break; | 5375 break; |
| 5377 } | 5376 } |
| 5378 } | 5377 } |
| 5379 | 5378 |
| 5380 if (!m_valueList->next()) | 5379 if (!m_valueList->next()) |
| 5381 break; | 5380 break; |
| 5382 if (!consumeComma(m_valueList)) | 5381 if (!consumeComma(m_valueList)) |
| (...skipping 726 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 6109 || equalIgnoringCase(token, "n") || equalIgnoringCase(token, "-n"); | 6108 || equalIgnoringCase(token, "n") || equalIgnoringCase(token, "-n"); |
| 6110 } | 6109 } |
| 6111 | 6110 |
| 6112 bool CSSPropertyParser::isSystemColor(int id) | 6111 bool CSSPropertyParser::isSystemColor(int id) |
| 6113 { | 6112 { |
| 6114 // FIXME(sky): remove | 6113 // FIXME(sky): remove |
| 6115 return false; | 6114 return false; |
| 6116 } | 6115 } |
| 6117 | 6116 |
| 6118 } // namespace blink | 6117 } // namespace blink |
| OLD | NEW |