Implement animation tainted custom property values

third_party/WebKit/Source/core/css/resolver/CSSVariableResolver.cpp

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "core/css/resolver/CSSVariableResolver.h"
 
 #include "core/CSSPropertyNames.h"
 #include "core/CSSValueKeywords.h"
 #include "core/StyleBuilderFunctions.h"
 #include "core/StylePropertyShorthand.h"
 #include "core/css/CSSPendingSubstitutionValue.h"
 #include "core/css/CSSUnsetValue.h"
 #include "core/css/CSSVariableData.h"
 #include "core/css/CSSVariableReferenceValue.h"
 #include "core/css/PropertyRegistry.h"
 #include "core/css/parser/CSSParserToken.h"
 #include "core/css/parser/CSSParserTokenRange.h"
 #include "core/css/parser/CSSPropertyParser.h"
 #include "core/css/resolver/StyleBuilder.h"
 #include "core/css/resolver/StyleBuilderConverter.h"
 #include "core/css/resolver/StyleResolverState.h"
 #include "core/style/StyleInheritedVariables.h"
 #include "core/style/StyleNonInheritedVariables.h"
 #include "wtf/Vector.h"
 
 namespace blink {
 
 bool CSSVariableResolver::resolveFallback(CSSParserTokenRange range,
-                                          Vector<CSSParserToken>& result) {
+                                          bool omitAnimationTainted,
+                                          Vector<CSSParserToken>& result,
+                                          bool& resultIsAnimationTainted) {
   if (range.atEnd())
     return false;
   ASSERT(range.peek().type() == CommaToken);
   range.consume();
-  return resolveTokenRange(range, result);
+  return resolveTokenRange(range, omitAnimationTainted, result,
+                           resultIsAnimationTainted);
 }
 
 CSSVariableData* CSSVariableResolver::valueForCustomProperty(
     AtomicString name) {
   if (m_variablesSeen.contains(name)) {
     m_cycleStartPoints.add(name);
     return nullptr;
   }
 
   DCHECK(m_registry || !RuntimeEnabledFeatures::cssVariables2Enabled());
@@ skipping 38 matching lines @@
   if (!newVariableData)
     return registration->initialVariableData();
   return newVariableData.get();
 }
 
 PassRefPtr<CSSVariableData> CSSVariableResolver::resolveCustomProperty(
     AtomicString name,
     const CSSVariableData& variableData) {
   ASSERT(variableData.needsVariableResolution());
 
+  bool omitAnimationTainted = false;
+  bool isAnimationTainted = variableData.isAnimationTainted();
   Vector<CSSParserToken> tokens;
   m_variablesSeen.add(name);
-  bool success = resolveTokenRange(variableData.tokens(), tokens);
+  bool success = resolveTokenRange(variableData.tokens(), omitAnimationTainted,
+                                   tokens, isAnimationTainted);
   m_variablesSeen.remove(name);
 
   // The old variable data holds onto the backing string the new resolved CSSVariableData
   // relies on. Ensure it will live beyond us overwriting the RefPtr in StyleInheritedVariables.
   ASSERT(variableData.refCount() > 1);
 
   if (!success || !m_cycleStartPoints.isEmpty()) {
     m_cycleStartPoints.remove(name);
     return nullptr;
   }
-  return CSSVariableData::createResolved(tokens, variableData);
+  return CSSVariableData::createResolved(tokens, variableData,
+                                         isAnimationTainted);
 }
 
 bool CSSVariableResolver::resolveVariableReference(
     CSSParserTokenRange range,
-    Vector<CSSParserToken>& result) {
+    bool omitAnimationTainted,
+    Vector<CSSParserToken>& result,
+    bool& resultIsAnimationTainted) {
   range.consumeWhitespace();
   ASSERT(range.peek().type() == IdentToken);
   AtomicString variableName =
       range.consumeIncludingWhitespace().value().toAtomicString();
   ASSERT(range.atEnd() || (range.peek().type() == CommaToken));
 
   CSSVariableData* variableData = valueForCustomProperty(variableName);
-  if (!variableData)
-    return resolveFallback(range, result);
+  if (!variableData) {
+    return resolveFallback(range, omitAnimationTainted, result,
+                           resultIsAnimationTainted);
+  }
 
-  result.appendVector(variableData->tokens());
+  if (!omitAnimationTainted || !variableData->isAnimationTainted()) {

[alancutter (OOO until 2018), 2016/10/05 07:46:40]

Negate this and return so it reads better and doesn't need an else.

[alancutter (OOO until 2018), 2016/10/06 01:25:32]

Done.

+    result.appendVector(variableData->tokens());
+    resultIsAnimationTainted |= variableData->isAnimationTainted();
+  } else {
+    // TODO(alancutter): Append the registered initial custom property value.

[alancutter (OOO until 2018), 2016/10/05 07:46:40]

This should be calling resolveFallback instead of discarding it.

[alancutter (OOO until 2018), 2016/10/06 01:25:32]

Done.

+  }
+
   Vector<CSSParserToken> trash;
-  resolveFallback(range, trash);
+  bool trashIsAnimationTainted;
+  resolveFallback(range, omitAnimationTainted, trash, trashIsAnimationTainted);
   return true;
 }
 
 void CSSVariableResolver::resolveApplyAtRule(CSSParserTokenRange& range,
                                              Vector<CSSParserToken>& result) {
   DCHECK(range.peek().type() == AtKeywordToken &&
          equalIgnoringASCIICase(range.peek().value(), "apply"));
   range.consumeIncludingWhitespace();
   const CSSParserToken& variableName = range.consumeIncludingWhitespace();
   // TODO(timloh): Should we actually be consuming this?
@@ skipping 11 matching lines @@
     return;
   CSSParserTokenRange ruleContents = rule.consumeBlock();
   rule.consumeWhitespace();
   if (!rule.atEnd())
     return;
 
   result.appendRange(ruleContents.begin(), ruleContents.end());
 }
 
 bool CSSVariableResolver::resolveTokenRange(CSSParserTokenRange range,
-                                            Vector<CSSParserToken>& result) {
+                                            bool omitAnimationTainted,
+                                            Vector<CSSParserToken>& result,
+                                            bool& resultIsAnimationTainted) {
   bool success = true;
   while (!range.atEnd()) {
     if (range.peek().functionId() == CSSValueVar) {
-      success &= resolveVariableReference(range.consumeBlock(), result);
+      success &=
+          resolveVariableReference(range.consumeBlock(), omitAnimationTainted,
+                                   result, resultIsAnimationTainted);
     } else if (range.peek().type() == AtKeywordToken &&
                equalIgnoringASCIICase(range.peek().value(), "apply") &&
                RuntimeEnabledFeatures::cssApplyAtRulesEnabled()) {
       resolveApplyAtRule(range, result);
     } else {
       result.append(range.consume());
     }
   }
   return success;
 }
 
 const CSSValue* CSSVariableResolver::resolveVariableReferences(
     const StyleResolverState& state,
     CSSPropertyID id,
-    const CSSValue& value) {
+    const CSSValue& value,
+    bool omitAnimationTainted) {
   ASSERT(!isShorthandProperty(id));
 
-  if (value.isPendingSubstitutionValue())
-    return resolvePendingSubstitutions(state, id,
-                                       toCSSPendingSubstitutionValue(value));
+  if (value.isPendingSubstitutionValue()) {
+    return resolvePendingSubstitutions(
+        state, id, toCSSPendingSubstitutionValue(value), omitAnimationTainted);
+  }
 
-  if (value.isVariableReferenceValue())
-    return resolveVariableReferences(state, id,
-                                     toCSSVariableReferenceValue(value));
+  if (value.isVariableReferenceValue()) {
+    return resolveVariableReferences(
+        state, id, toCSSVariableReferenceValue(value), omitAnimationTainted);
+  }
 
   NOTREACHED();
   return nullptr;
 }
 
 const CSSValue* CSSVariableResolver::resolveVariableReferences(
     const StyleResolverState& state,
     CSSPropertyID id,
-    const CSSVariableReferenceValue& value) {
+    const CSSVariableReferenceValue& value,
+    bool omitAnimationTainted) {
   CSSVariableResolver resolver(state);
   Vector<CSSParserToken> tokens;
-  if (!resolver.resolveTokenRange(value.variableDataValue()->tokens(), tokens))
+  bool isAnimationTainted = false;
+  if (!resolver.resolveTokenRange(value.variableDataValue()->tokens(),
+                                  omitAnimationTainted, tokens,
+                                  isAnimationTainted))
     return CSSUnsetValue::create();
   const CSSValue* result =
       CSSPropertyParser::parseSingleValue(id, tokens, strictCSSParserContext());
   if (!result)
     return CSSUnsetValue::create();
   return result;
 }
 
 const CSSValue* CSSVariableResolver::resolvePendingSubstitutions(
     const StyleResolverState& state,
     CSSPropertyID id,
-    const CSSPendingSubstitutionValue& pendingValue) {
+    const CSSPendingSubstitutionValue& pendingValue,
+    bool omitAnimationTainted) {
   // Longhands from shorthand references follow this path.
   HeapHashMap<CSSPropertyID, Member<const CSSValue>>& propertyCache =
       state.parsedPropertiesForPendingSubstitutionCache(pendingValue);
 
   const CSSValue* value = propertyCache.get(id);
   if (!value) {
     // TODO(timloh): We shouldn't retry this for all longhands if the shorthand ends up invalid
     CSSVariableReferenceValue* shorthandValue = pendingValue.shorthandValue();
     CSSPropertyID shorthandPropertyId = pendingValue.shorthandPropertyId();
 
     CSSVariableResolver resolver(state);
 
     Vector<CSSParserToken> tokens;
+    bool isAnimationTainted = false;
     if (resolver.resolveTokenRange(
-            shorthandValue->variableDataValue()->tokens(), tokens)) {
+            shorthandValue->variableDataValue()->tokens(), omitAnimationTainted,
+            tokens, isAnimationTainted)) {
       CSSParserContext context(HTMLStandardMode, 0);
 
       HeapVector<CSSProperty, 256> parsedProperties;
 
       if (CSSPropertyParser::parseValue(
               shorthandPropertyId, false, CSSParserTokenRange(tokens), context,
               parsedProperties, StyleRule::RuleType::Style)) {
         unsigned parsedPropertiesCount = parsedProperties.size();
         for (unsigned i = 0; i < parsedPropertiesCount; ++i) {
           propertyCache.set(parsedProperties[i].id(),
@@ skipping 34 matching lines @@
     : m_styleResolverState(state),
       m_inheritedVariables(state.style()->inheritedVariables()),
       m_nonInheritedVariables(state.style()->nonInheritedVariables()),
       m_registry(state.document().propertyRegistry()) {}
 
 DEFINE_TRACE(CSSVariableResolver) {
   visitor->trace(m_registry);
 }
 
 }  // namespace blink