| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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/CSSSyntaxDescriptor.h" | 5 #include "core/css/CSSSyntaxDescriptor.h" |
| 6 | 6 |
| 7 #include "core/css/CSSCustomPropertyDeclaration.h" | 7 #include "core/css/CSSCustomPropertyDeclaration.h" |
| 8 #include "core/css/CSSURIValue.h" | 8 #include "core/css/CSSURIValue.h" |
| 9 #include "core/css/CSSValueList.h" | 9 #include "core/css/CSSValueList.h" |
| 10 #include "core/css/CSSVariableReferenceValue.h" | 10 #include "core/css/CSSVariableReferenceValue.h" |
| (...skipping 176 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 187 list->append(*value); | 187 list->append(*value); |
| 188 } | 188 } |
| 189 return list; | 189 return list; |
| 190 } | 190 } |
| 191 const CSSValue* result = consumeSingleType(syntax, range); | 191 const CSSValue* result = consumeSingleType(syntax, range); |
| 192 if (!range.atEnd()) | 192 if (!range.atEnd()) |
| 193 return nullptr; | 193 return nullptr; |
| 194 return result; | 194 return result; |
| 195 } | 195 } |
| 196 | 196 |
| 197 const CSSValue* CSSSyntaxDescriptor::parse(CSSParserTokenRange range) const { | 197 const CSSValue* CSSSyntaxDescriptor::parse(CSSParserTokenRange range, |
| 198 if (isTokenStream()) | 198 bool isAnimationTainted) const { |
| 199 return CSSVariableParser::parseRegisteredPropertyValue(range, false); | 199 if (isTokenStream()) { |
| 200 return CSSVariableParser::parseRegisteredPropertyValue(range, false, |
| 201 isAnimationTainted); |
| 202 } |
| 200 range.consumeWhitespace(); | 203 range.consumeWhitespace(); |
| 201 for (const CSSSyntaxComponent& component : m_syntaxComponents) { | 204 for (const CSSSyntaxComponent& component : m_syntaxComponents) { |
| 202 if (const CSSValue* result = consumeSyntaxComponent(component, range)) | 205 if (const CSSValue* result = consumeSyntaxComponent(component, range)) |
| 203 return result; | 206 return result; |
| 204 } | 207 } |
| 205 return CSSVariableParser::parseRegisteredPropertyValue(range, true); | 208 return CSSVariableParser::parseRegisteredPropertyValue(range, true, |
| 209 isAnimationTainted); |
| 206 } | 210 } |
| 207 | 211 |
| 208 } // namespace blink | 212 } // namespace blink |
| OLD | NEW |