| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "core/css/parser/CSSPropertyParser.h" | 5 #include "core/css/parser/CSSPropertyParser.h" |
| 6 | 6 |
| 7 #include "core/StylePropertyShorthand.h" | 7 #include "core/StylePropertyShorthand.h" |
| 8 #include "core/css/CSSCalculationValue.h" | 8 #include "core/css/CSSCalculationValue.h" |
| 9 #include "core/css/CSSCounterValue.h" | 9 #include "core/css/CSSCounterValue.h" |
| 10 #include "core/css/CSSCrossfadeValue.h" | 10 #include "core/css/CSSCrossfadeValue.h" |
| (...skipping 1516 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1527 { | 1527 { |
| 1528 if (range.peek().id() == CSSValueNone) | 1528 if (range.peek().id() == CSSValueNone) |
| 1529 return consumeIdent(range); | 1529 return consumeIdent(range); |
| 1530 | 1530 |
| 1531 if (allowQuotedName && range.peek().type() == StringToken) { | 1531 if (allowQuotedName && range.peek().type() == StringToken) { |
| 1532 // Legacy support for strings in prefixed animations. | 1532 // Legacy support for strings in prefixed animations. |
| 1533 if (context.useCounter()) | 1533 if (context.useCounter()) |
| 1534 context.useCounter()->count(UseCounter::QuotedAnimationName); | 1534 context.useCounter()->count(UseCounter::QuotedAnimationName); |
| 1535 | 1535 |
| 1536 const CSSParserToken& token = range.consumeIncludingWhitespace(); | 1536 const CSSParserToken& token = range.consumeIncludingWhitespace(); |
| 1537 if (token.valueEqualsIgnoringCase("none")) | 1537 if (token.valueEqualsIgnoringASCIICase("none")) |
| 1538 return cssValuePool().createIdentifierValue(CSSValueNone); | 1538 return cssValuePool().createIdentifierValue(CSSValueNone); |
| 1539 return CSSCustomIdentValue::create(token.value()); | 1539 return CSSCustomIdentValue::create(token.value()); |
| 1540 } | 1540 } |
| 1541 | 1541 |
| 1542 return consumeCustomIdent(range); | 1542 return consumeCustomIdent(range); |
| 1543 } | 1543 } |
| 1544 | 1544 |
| 1545 static PassRefPtrWillBeRawPtr<CSSValue> consumeTransitionProperty(CSSParserToken
Range& range) | 1545 static PassRefPtrWillBeRawPtr<CSSValue> consumeTransitionProperty(CSSParserToken
Range& range) |
| 1546 { | 1546 { |
| 1547 const CSSParserToken& token = range.peek(); | 1547 const CSSParserToken& token = range.peek(); |
| (...skipping 2388 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3936 m_currentShorthand = oldShorthand; | 3936 m_currentShorthand = oldShorthand; |
| 3937 CSSParserValueList valueList(m_range); | 3937 CSSParserValueList valueList(m_range); |
| 3938 if (!valueList.size()) | 3938 if (!valueList.size()) |
| 3939 return false; | 3939 return false; |
| 3940 m_valueList = &valueList; | 3940 m_valueList = &valueList; |
| 3941 return legacyParseShorthand(unresolvedProperty, important); | 3941 return legacyParseShorthand(unresolvedProperty, important); |
| 3942 } | 3942 } |
| 3943 } | 3943 } |
| 3944 | 3944 |
| 3945 } // namespace blink | 3945 } // namespace blink |
| OLD | NEW |