Chromium Code Reviews| Index: third_party/WebKit/Source/core/css/resolver/CSSVariableResolver.h |
| diff --git a/third_party/WebKit/Source/core/css/resolver/CSSVariableResolver.h b/third_party/WebKit/Source/core/css/resolver/CSSVariableResolver.h |
| index 4420205f29e8b5890b9948d49f1fe03e55bc2e89..b1439b218915a465e145613b0c2882b339cfc54b 100644 |
| --- a/third_party/WebKit/Source/core/css/resolver/CSSVariableResolver.h |
| +++ b/third_party/WebKit/Source/core/css/resolver/CSSVariableResolver.h |
| @@ -31,7 +31,8 @@ class CSSVariableResolver { |
| // Shorthand properties are not supported. |
| static const CSSValue* resolveVariableReferences(const StyleResolverState&, |
| CSSPropertyID, |
| - const CSSValue&); |
| + const CSSValue&, |
| + bool omitAnimationTainted); |
|
alancutter (OOO until 2018)
2016/10/05 07:46:40
This should actually be disallowAnimationTainted.
alancutter (OOO until 2018)
2016/10/06 01:25:33
Done.
|
| DECLARE_TRACE(); |
| @@ -41,21 +42,31 @@ class CSSVariableResolver { |
| static const CSSValue* resolvePendingSubstitutions( |
| const StyleResolverState&, |
| CSSPropertyID, |
| - const CSSPendingSubstitutionValue&); |
| + const CSSPendingSubstitutionValue&, |
| + bool omitAnimationTainted); |
| static const CSSValue* resolveVariableReferences( |
| const StyleResolverState&, |
| CSSPropertyID, |
| - const CSSVariableReferenceValue&); |
| + const CSSVariableReferenceValue&, |
| + bool omitAnimationTainted); |
| // These return false if we encounter a reference to an invalid variable with no fallback |
| // Resolves a range which may contain var() references or @apply rules |
| - bool resolveTokenRange(CSSParserTokenRange, Vector<CSSParserToken>& result); |
| + bool resolveTokenRange(CSSParserTokenRange, |
| + bool omitAnimationTainted, |
| + Vector<CSSParserToken>& result, |
| + bool& resultIsAnimationTainted); |
| // Resolves the fallback (if present) of a var() reference, starting from the comma |
| - bool resolveFallback(CSSParserTokenRange, Vector<CSSParserToken>& result); |
| + bool resolveFallback(CSSParserTokenRange, |
| + bool omitAnimationTainted, |
| + Vector<CSSParserToken>& result, |
| + bool& resultIsAnimationTainted); |
| // Resolves the contents of a var() reference |
| bool resolveVariableReference(CSSParserTokenRange, |
| - Vector<CSSParserToken>& result); |
| + bool omitAnimationTainted, |
| + Vector<CSSParserToken>& result, |
| + bool& resultIsAnimationTainted); |
| // Consumes and resolves an @apply rule |
| void resolveApplyAtRule(CSSParserTokenRange&, Vector<CSSParserToken>& result); |