Defer compositor keyframe snapshots until the next style resolve

third_party/WebKit/Source/core/animation/EffectInput.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 60 matching lines @@
     }
 
     if (offset < lastOffset) {
         exceptionState.throwTypeError("Keyframes with specified offsets are not sorted");
         return false;
     }
 
     return true;
 }
 
-// Returns true if the property passed in is a compositable property.
-bool setKeyframeValue(Element& element, StringKeyframe& keyframe, const String& property, const String& value)
+void setKeyframeValue(Element& element, StringKeyframe& keyframe, const String& property, const String& value)
 {
     StyleSheetContents* styleSheetContents = element.document().elementSheet().contents();
     CSSPropertyID cssProperty = AnimationInputHelpers::keyframeAttributeToCSSProperty(property, element.document());
     if (cssProperty != CSSPropertyInvalid) {
         keyframe.setCSSPropertyValue(cssProperty, value, &element, styleSheetContents);
-        return CompositorAnimations::isCompositableProperty(cssProperty);
+        return;
     }
     cssProperty = AnimationInputHelpers::keyframeAttributeToPresentationAttribute(property, element);
     if (cssProperty != CSSPropertyInvalid) {
         keyframe.setPresentationAttributeValue(cssProperty, value, &element, styleSheetContents);
-        return false;
+        return;
     }
     const QualifiedName* svgAttribute = AnimationInputHelpers::keyframeAttributeToSVGAttribute(property, element);
     if (svgAttribute)
         keyframe.setSVGAttributeValue(*svgAttribute, value);
-    return false;
 }
 
-EffectModel* createEffectModelFromKeyframes(Element& element, const StringKeyframeVector& keyframes, bool encounteredCompositableProperty, ExceptionState& exceptionState)
+EffectModel* createEffectModelFromKeyframes(Element& element, const StringKeyframeVector& keyframes, ExceptionState& exceptionState)
 {
-    // TODO(alancutter): Remove this once composited animations no longer depend on AnimatableValues.
-    if (encounteredCompositableProperty && element.inActiveDocument())
-        element.document().updateStyleAndLayoutTreeForNode(&element);
-
     StringKeyframeEffectModel* keyframeEffectModel = StringKeyframeEffectModel::create(keyframes, LinearTimingFunction::shared());
     if (!RuntimeEnabledFeatures::cssAdditiveAnimationsEnabled()) {
         for (const auto& keyframeGroup : keyframeEffectModel->getPropertySpecificKeyframeGroups()) {
             PropertyHandle property = keyframeGroup.key;
             if (!property.isCSSProperty())
                 continue;
 
             for (const auto& keyframe : keyframeGroup.value->keyframes()) {
                 if (keyframe->isNeutral()) {
                     exceptionState.throwDOMException(NotSupportedError, "Partial keyframes are not supported.");
                     return nullptr;
                 }
                 if (keyframe->composite() != EffectModel::CompositeReplace) {
                     exceptionState.throwDOMException(NotSupportedError, "Additive animations are not supported.");
                     return nullptr;
                 }
             }
         }
     }
-    keyframeEffectModel->forceConversionsToAnimatableValues(element, element.computedStyle());
 
     ASSERT(!exceptionState.hadException());
     return keyframeEffectModel;
 }
 
 bool exhaustDictionaryIterator(DictionaryIterator& iterator, ExecutionContext* executionContext, ExceptionState& exceptionState, Vector<Dictionary>& result)
 {
     while (iterator.next(executionContext, exceptionState)) {
         Dictionary dictionary;
         if (!iterator.valueAsDictionary(dictionary, exceptionState)) {
@@ skipping 29 matching lines @@
         return nullptr;
     }
 
     return convertObjectForm(*element, dictionary, exceptionState);
 }
 
 EffectModel* EffectInput::convertArrayForm(Element& element, const Vector<Dictionary>& keyframeDictionaries, ExceptionState& exceptionState)
 {
     StringKeyframeVector keyframes;
     double lastOffset = 0;
-    bool encounteredCompositableProperty = false;
 
     for (const Dictionary& keyframeDictionary : keyframeDictionaries) {
         RefPtr<StringKeyframe> keyframe = StringKeyframe::create();
 
         ScriptValue scriptValue;
         bool frameHasOffset = DictionaryHelper::get(keyframeDictionary, "offset", scriptValue) && !scriptValue.isNull();
 
         double offset = 0.0;
         if (frameHasOffset) {
             if (!getAndCheckOffset(keyframeDictionary, offset, lastOffset, exceptionState))
@@ skipping 27 matching lines @@
 
             Vector<String> values;
             if (DictionaryHelper::get(keyframeDictionary, property, values)) {
                 exceptionState.throwTypeError("Lists of values not permitted in array-form list of keyframes");
                 return nullptr;
             }
 
             String value;
             DictionaryHelper::get(keyframeDictionary, property, value);
 
-            encounteredCompositableProperty |= setKeyframeValue(element, *keyframe.get(), property, value);
+            setKeyframeValue(element, *keyframe.get(), property, value);
         }
         keyframes.append(keyframe);
     }
 
     ASSERT(!exceptionState.hadException());
 
-    return createEffectModelFromKeyframes(element, keyframes, encounteredCompositableProperty, exceptionState);
+    return createEffectModelFromKeyframes(element, keyframes, exceptionState);
 }
 
 EffectModel* EffectInput::convertObjectForm(Element& element, const Dictionary& keyframeDictionary, ExceptionState& exceptionState)
 {
     StringKeyframeVector keyframes;
-    bool encounteredCompositableProperty = false;
 
     String timingFunctionString;
     RefPtr<TimingFunction> timingFunction = nullptr;
     if (DictionaryHelper::get(keyframeDictionary, "easing", timingFunctionString)) {
         timingFunction = AnimationInputHelpers::parseTimingFunction(timingFunctionString, &element.document(), exceptionState);
         if (!timingFunction)
             return nullptr;
     }
 
     ScriptValue scriptValue;
@@ skipping 33 matching lines @@
             else
                 keyframe->setOffset(i / (numKeyframes - 1.0));
 
             if (timingFunction)
                 keyframe->setEasing(timingFunction);
 
             if (compositeString == "add")
                 keyframe->setComposite(EffectModel::CompositeAdd);
             // TODO(alancutter): Support "accumulate" keyframe composition.
 
-            encounteredCompositableProperty |= setKeyframeValue(element, *keyframe.get(), property, values[i]);
+            setKeyframeValue(element, *keyframe.get(), property, values[i]);
             keyframes.append(keyframe);
         }
     }
 
     std::sort(keyframes.begin(), keyframes.end(), compareKeyframes);
 
     ASSERT(!exceptionState.hadException());
 
-    return createEffectModelFromKeyframes(element, keyframes, encounteredCompositableProperty, exceptionState);
+    return createEffectModelFromKeyframes(element, keyframes, exceptionState);
 }
 
 } // namespace blink