Code cleanup: Replace Element with Document in element.animate()

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 20 matching lines @@
 #include "core/animation/EffectInput.h"
 
 #include "bindings/core/v8/Dictionary.h"
 #include "bindings/core/v8/EffectModelOrDictionarySequenceOrDictionary.h"
 #include "core/animation/AnimationInputHelpers.h"
 #include "core/animation/CompositorAnimations.h"
 #include "core/animation/KeyframeEffectModel.h"
 #include "core/animation/StringKeyframe.h"
 #include "core/css/CSSStyleSheet.h"
 #include "core/dom/Document.h"
-#include "core/dom/Element.h"
 #include "core/dom/ExceptionCode.h"
 #include "core/dom/NodeComputedStyle.h"
 #include "wtf/ASCIICType.h"
 #include "wtf/HashSet.h"
 #include "wtf/NonCopyingSort.h"
 
 namespace blink {
 
 namespace {
 
@@ skipping 19 matching lines @@
     }
 
     if (offset < lastOffset) {
         exceptionState.throwTypeError("Keyframes with specified offsets are not sorted");
         return false;
     }
 
     return true;
 }
 
-void setKeyframeValue(Element& element, StringKeyframe& keyframe, const String& property, const String& value)
+void setKeyframeValue(Document& document, StringKeyframe& keyframe, const String& property, const String& value)
 {
-    StyleSheetContents* styleSheetContents = element.document().elementSheet().contents();
-    CSSPropertyID cssProperty = AnimationInputHelpers::keyframeAttributeToCSSProperty(property, element.document());
+    StyleSheetContents* styleSheetContents = document.elementSheet().contents();
+    CSSPropertyID cssProperty = AnimationInputHelpers::keyframeAttributeToCSSProperty(property, document);
     if (cssProperty != CSSPropertyInvalid) {
-        keyframe.setCSSPropertyValue(cssProperty, value, &element, styleSheetContents);
+        keyframe.setCSSPropertyValue(cssProperty, value, styleSheetContents);
         return;
     }
-    cssProperty = AnimationInputHelpers::keyframeAttributeToPresentationAttribute(property, element);
+    cssProperty = AnimationInputHelpers::keyframeAttributeToPresentationAttribute(property);
     if (cssProperty != CSSPropertyInvalid) {
-        keyframe.setPresentationAttributeValue(cssProperty, value, &element, styleSheetContents);
+        keyframe.setPresentationAttributeValue(cssProperty, value, styleSheetContents);
         return;
     }
-    const QualifiedName* svgAttribute = AnimationInputHelpers::keyframeAttributeToSVGAttribute(property, element);
+    const QualifiedName* svgAttribute = AnimationInputHelpers::keyframeAttributeToSVGAttribute(property);
     if (svgAttribute)
         keyframe.setSVGAttributeValue(*svgAttribute, value);
 }
 
-EffectModel* createEffectModelFromKeyframes(Element& element, const StringKeyframeVector& keyframes, ExceptionState& exceptionState)
+EffectModel* createEffectModelFromKeyframes(const StringKeyframeVector& keyframes, ExceptionState& exceptionState)
 {
     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()) {
@@ skipping 21 matching lines @@
             return false;
         }
         result.append(dictionary);
     }
     return !exceptionState.hadException();
 }
 
 } // namespace
 
 // Spec: http://w3c.github.io/web-animations/#processing-a-frames-argument
-EffectModel* EffectInput::convert(Element* element, const EffectModelOrDictionarySequenceOrDictionary& effectInput, ExecutionContext* executionContext, ExceptionState& exceptionState)
+EffectModel* EffectInput::convert(Document& document, const EffectModelOrDictionarySequenceOrDictionary& effectInput, ExecutionContext* executionContext, ExceptionState& exceptionState)
 {
     if (effectInput.isEffectModel())
         return effectInput.getAsEffectModel();
 
-    if (effectInput.isNull() || !element)
+    if (effectInput.isNull())
         return nullptr;
 
     if (effectInput.isDictionarySequence())
-        return convertArrayForm(*element, effectInput.getAsDictionarySequence(), exceptionState);
+        return convertArrayForm(document, effectInput.getAsDictionarySequence(), exceptionState);
 
     const Dictionary& dictionary = effectInput.getAsDictionary();
     DictionaryIterator iterator = dictionary.getIterator(executionContext);
     if (!iterator.isNull()) {
         // TODO(alancutter): Convert keyframes during iteration rather than after to match spec.
         Vector<Dictionary> keyframeDictionaries;
         if (exhaustDictionaryIterator(iterator, executionContext, exceptionState, keyframeDictionaries))
-            return convertArrayForm(*element, keyframeDictionaries, exceptionState);
+            return convertArrayForm(document, keyframeDictionaries, exceptionState);
         return nullptr;
     }
 
-    return convertObjectForm(*element, dictionary, exceptionState);
+    return convertObjectForm(document, dictionary, exceptionState);
 }
 
-EffectModel* EffectInput::convertArrayForm(Element& element, const Vector<Dictionary>& keyframeDictionaries, ExceptionState& exceptionState)
+EffectModel* EffectInput::convertArrayForm(Document& document, const Vector<Dictionary>& keyframeDictionaries, ExceptionState& exceptionState)
 {
     StringKeyframeVector keyframes;
     double lastOffset = 0;
 
     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))
                 return nullptr;
             lastOffset = offset;
             keyframe->setOffset(offset);
         }
 
         String compositeString;
         DictionaryHelper::get(keyframeDictionary, "composite", compositeString);
         if (compositeString == "add")
             keyframe->setComposite(EffectModel::CompositeAdd);
         // TODO(alancutter): Support "accumulate" keyframe composition.
 
         String timingFunctionString;
         if (DictionaryHelper::get(keyframeDictionary, "easing", timingFunctionString)) {
-            RefPtr<TimingFunction> timingFunction = AnimationInputHelpers::parseTimingFunction(timingFunctionString, &element.document(), exceptionState);
+            RefPtr<TimingFunction> timingFunction = AnimationInputHelpers::parseTimingFunction(timingFunctionString, document, exceptionState);
             if (!timingFunction)
                 return nullptr;
             keyframe->setEasing(timingFunction);
         }
 
         Vector<String> keyframeProperties;
         keyframeDictionary.getPropertyNames(keyframeProperties);
         for (const auto& property : keyframeProperties) {
             if (property == "offset"
                 || property == "composite"
                 || property == "easing") {
                 continue;
             }
 
             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);
 
-            setKeyframeValue(element, *keyframe.get(), property, value);
+            setKeyframeValue(document, *keyframe.get(), property, value);
         }
         keyframes.append(keyframe);
     }
 
     ASSERT(!exceptionState.hadException());
 
-    return createEffectModelFromKeyframes(element, keyframes, exceptionState);
+    return createEffectModelFromKeyframes(keyframes, exceptionState);
 }
 
-EffectModel* EffectInput::convertObjectForm(Element& element, const Dictionary& keyframeDictionary, ExceptionState& exceptionState)
+EffectModel* EffectInput::convertObjectForm(Document& document, const Dictionary& keyframeDictionary, ExceptionState& exceptionState)
 {
     StringKeyframeVector keyframes;
 
     String timingFunctionString;
     RefPtr<TimingFunction> timingFunction = nullptr;
     if (DictionaryHelper::get(keyframeDictionary, "easing", timingFunctionString)) {
-        timingFunction = AnimationInputHelpers::parseTimingFunction(timingFunctionString, &element.document(), exceptionState);
+        timingFunction = AnimationInputHelpers::parseTimingFunction(timingFunctionString, document, exceptionState);
         if (!timingFunction)
             return nullptr;
     }
 
     ScriptValue scriptValue;
     bool frameHasOffset = DictionaryHelper::get(keyframeDictionary, "offset", scriptValue) && !scriptValue.isNull();
     double offset = 0.0;
     if (frameHasOffset && !getAndCheckOffset(keyframeDictionary, offset, 0.0, exceptionState))
         return nullptr;
 
@@ skipping 28 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.
 
-            setKeyframeValue(element, *keyframe.get(), property, values[i]);
+            setKeyframeValue(document, *keyframe.get(), property, values[i]);
             keyframes.append(keyframe);
         }
     }
 
     std::sort(keyframes.begin(), keyframes.end(), compareKeyframes);
 
     ASSERT(!exceptionState.hadException());
 
-    return createEffectModelFromKeyframes(element, keyframes, exceptionState);
+    return createEffectModelFromKeyframes(keyframes, exceptionState);
 }
 
 } // namespace blink