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

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

 // Copyright 2014 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/animation/AnimationInputHelpers.h"
 
 #include "bindings/core/v8/ExceptionState.h"
 #include "core/SVGNames.h"
 #include "core/css/CSSValueList.h"
 #include "core/css/parser/CSSParser.h"
@@ skipping 35 matching lines @@
                 Deprecation::countDeprecation(document, UseCounter::WebAnimationHyphenatedProperty);
             return CSSPropertyInvalid;
         }
         if (isASCIIUpper(property[i]))
             builder.append('-');
         builder.append(property[i]);
     }
     return cssPropertyID(builder.toString());
 }
 
-CSSPropertyID AnimationInputHelpers::keyframeAttributeToPresentationAttribute(const String& property, const Element& element)
+CSSPropertyID AnimationInputHelpers::keyframeAttributeToPresentationAttribute(const String& property)
 {
-    if (!RuntimeEnabledFeatures::webAnimationsSVGEnabled() || !element.isSVGElement() || !isSVGPrefixed(property))
+    if (!RuntimeEnabledFeatures::webAnimationsSVGEnabled() || !isSVGPrefixed(property))
         return CSSPropertyInvalid;
 
     String unprefixedProperty = removeSVGPrefix(property);
     if (SVGElement::isAnimatableCSSProperty(QualifiedName(nullAtom, AtomicString(unprefixedProperty), nullAtom)))
         return cssPropertyID(unprefixedProperty);
 
     return CSSPropertyInvalid;
 }
 
 using AttributeNameMap = HashMap<QualifiedName, const QualifiedName*>;
@@ skipping 108 matching lines @@
     }
     return supportedAttributes;
 }
 
 QualifiedName svgAttributeName(const String& property)
 {
     ASSERT(!isSVGPrefixed(property));
     return QualifiedName(nullAtom, AtomicString(property), nullAtom);
 }
 
-const QualifiedName* AnimationInputHelpers::keyframeAttributeToSVGAttribute(const String& property, Element& element)
+const QualifiedName* AnimationInputHelpers::keyframeAttributeToSVGAttribute(const String& property)
 {
-    if (!RuntimeEnabledFeatures::webAnimationsSVGEnabled() || !element.isSVGElement() || !isSVGPrefixed(property))

[suzyh_UTC10 (ex-contributor), 2016/07/07 05:59:44]

Why do we no longer need the SVG element checks here and in the function above?

-        return nullptr;
-
-    SVGElement& svgElement = toSVGElement(element);
-    if (isSVGSMILElement(svgElement))
+    if (!RuntimeEnabledFeatures::webAnimationsSVGEnabled() || !isSVGPrefixed(property))
         return nullptr;
 
     String unprefixedProperty = removeSVGPrefix(property);
     QualifiedName attributeName = svgAttributeName(unprefixedProperty);
     const AttributeNameMap& supportedAttributes = getSupportedAttributes();
     auto iter = supportedAttributes.find(attributeName);
-    if (iter == supportedAttributes.end() || !svgElement.propertyFromAttribute(*iter->value))
+    if (iter == supportedAttributes.end())
         return nullptr;
 
     return iter->value;
 }
 
-PassRefPtr<TimingFunction> AnimationInputHelpers::parseTimingFunction(const String& string, Document* document, ExceptionState& exceptionState)
+PassRefPtr<TimingFunction> AnimationInputHelpers::parseTimingFunction(const String& string, Document& document, ExceptionState& exceptionState)
 {
     if (string.isEmpty()) {
         exceptionState.throwTypeError("Easing may not be the empty string");
         return nullptr;
     }
 
     CSSValue* value = CSSParser::parseSingleValue(CSSPropertyTransitionTimingFunction, string);
     if (!value || !value->isValueList()) {
         ASSERT(!value || value->isCSSWideKeyword());
         bool throwTypeError = true;
-        if (document) {
-            if (string.startsWith("function")) {
-                // Due to a bug in old versions of the web-animations-next
-                // polyfill, in some circumstances the string passed in here
-                // may be a Javascript function instead of the allowed values
-                // from the spec
-                // (http://w3c.github.io/web-animations/#dom-animationeffecttimingreadonly-easing)
-                // This bug was fixed in
-                // https://github.com/web-animations/web-animations-next/pull/423
-                // and we want to track how often it is still being hit. The
-                // linear case is special because 'linear' is the default value
-                // for easing. See http://crbug.com/601672
-                if (string == "function (a){return a}") {
-                    Deprecation::countDeprecation(*document, UseCounter::WebAnimationsEasingAsFunctionLinear);
-                    throwTypeError = false;
-                } else {
-                    UseCounter::count(*document, UseCounter::WebAnimationsEasingAsFunctionOther);
-                }
+        if (string.startsWith("function")) {
+            // Due to a bug in old versions of the web-animations-next
+            // polyfill, in some circumstances the string passed in here
+            // may be a Javascript function instead of the allowed values
+            // from the spec
+            // (http://w3c.github.io/web-animations/#dom-animationeffecttimingreadonly-easing)
+            // This bug was fixed in
+            // https://github.com/web-animations/web-animations-next/pull/423
+            // and we want to track how often it is still being hit. The
+            // linear case is special because 'linear' is the default value
+            // for easing. See http://crbug.com/601672
+            if (string == "function (a){return a}") {
+                Deprecation::countDeprecation(document, UseCounter::WebAnimationsEasingAsFunctionLinear);
+                throwTypeError = false;
+            } else {
+                UseCounter::count(document, UseCounter::WebAnimationsEasingAsFunctionOther);
             }
         }
 
         // TODO(suzyh): This return clause exists so that the special linear
         // function case above is exempted from causing TypeErrors. The
         // throwTypeError bool and this if-statement should be removed after the
         // M53 branch point in July 2016, so that this case will also throw
         // TypeErrors from M54 onward.
         if (!throwTypeError) {
             return Timing::defaults().timingFunction;
         }
 
         exceptionState.throwTypeError("'" + string + "' is not a valid value for easing");
         return nullptr;
     }
     CSSValueList* valueList = toCSSValueList(value);
     if (valueList->length() > 1) {
         exceptionState.throwTypeError("Easing may not be set to a list of values");
         return nullptr;
     }
     return CSSToStyleMap::mapAnimationTimingFunction(valueList->item(0), true);
 }
 
 } // namespace blink