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 3038 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3049 if (value->id == CSSValueRunning || value->id == CSSValuePaused) | 3049 if (value->id == CSSValueRunning || value->id == CSSValuePaused) |
3050 return cssValuePool().createIdentifierValue(value->id); | 3050 return cssValuePool().createIdentifierValue(value->id); |
3051 return nullptr; | 3051 return nullptr; |
3052 } | 3052 } |
3053 | 3053 |
3054 PassRefPtrWillBeRawPtr<CSSValue> CSSPropertyParser::parseAnimationProperty() | 3054 PassRefPtrWillBeRawPtr<CSSValue> CSSPropertyParser::parseAnimationProperty() |
3055 { | 3055 { |
3056 CSSParserValue* value = m_valueList->current(); | 3056 CSSParserValue* value = m_valueList->current(); |
3057 if (value->m_unit != CSSParserValue::Identifier) | 3057 if (value->m_unit != CSSParserValue::Identifier) |
3058 return nullptr; | 3058 return nullptr; |
3059 // Since all is valid css property keyword, cssPropertyID for all | |
3060 // returns non-null value. We need to check "all" before | |
3061 // cssPropertyID check. | |
3062 if (value->id == CSSValueAll) | |
3063 return cssValuePool().createIdentifierValue(CSSValueAll); | |
3064 CSSPropertyID property = unresolvedCSSPropertyID(value->string); | 3059 CSSPropertyID property = unresolvedCSSPropertyID(value->string); |
3065 if (property) { | 3060 if (property) { |
3066 ASSERT(CSSPropertyMetadata::isEnabledProperty(property)); | 3061 ASSERT(CSSPropertyMetadata::isEnabledProperty(property)); |
3067 return cssValuePool().createIdentifierValue(property); | 3062 return cssValuePool().createIdentifierValue(property); |
3068 } | 3063 } |
3069 if (value->id == CSSValueNone) | 3064 if (value->id == CSSValueNone) |
3070 return cssValuePool().createIdentifierValue(CSSValueNone); | 3065 return cssValuePool().createIdentifierValue(CSSValueNone); |
3071 if (value->id == CSSValueInitial || value->id == CSSValueInherit) | 3066 if (value->id == CSSValueInitial || value->id == CSSValueInherit) |
3072 return nullptr; | 3067 return nullptr; |
3073 return createPrimitiveCustomIdentValue(value); | 3068 return createPrimitiveCustomIdentValue(value); |
(...skipping 5035 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
8109 } | 8104 } |
8110 } | 8105 } |
8111 | 8106 |
8112 if (!list->length()) | 8107 if (!list->length()) |
8113 return nullptr; | 8108 return nullptr; |
8114 | 8109 |
8115 return list.release(); | 8110 return list.release(); |
8116 } | 8111 } |
8117 | 8112 |
8118 } // namespace blink | 8113 } // namespace blink |
OLD | NEW |