Web Animations: Update naming to reflect spec changes

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 171 matching lines @@
 
     auto iter = supportedAttributes.find(attributeName);
     if (iter == supportedAttributes.end() || !svgElement->propertyFromAttribute(*iter->value))
         return nullptr;
 
     return iter->value;
 }
 
 } // namespace
 
-PassRefPtrWillBeRawPtr<AnimationEffect> EffectInput::convert(Element* element, const Vector<Dictionary>& keyframeDictionaryVector, ExceptionState& exceptionState)
+PassRefPtrWillBeRawPtr<EffectModel> EffectInput::convert(Element* element, const Vector<Dictionary>& keyframeDictionaryVector, ExceptionState& exceptionState)
 {
     // FIXME: Remove the dependency on element.
     if (!element)
         return nullptr;
 
     StyleSheetContents* styleSheetContents = element->document().elementSheet().contents();
     StringKeyframeVector keyframes;
     double lastOffset = 0;
 
     for (const auto& keyframeDictionary : keyframeDictionaryVector) {
@@ skipping 23 matching lines @@
 
             lastOffset = offset;
 
             keyframe->setOffset(offset);
         }
         keyframes.append(keyframe);
 
         String compositeString;
         DictionaryHelper::get(keyframeDictionary, "composite", compositeString);
         if (compositeString == "add")
-            keyframe->setComposite(AnimationEffect::CompositeAdd);
+            keyframe->setComposite(EffectModel::CompositeAdd);
 
         String timingFunctionString;
         if (DictionaryHelper::get(keyframeDictionary, "easing", timingFunctionString)) {
             if (RefPtr<TimingFunction> timingFunction = AnimationInputHelpers::parseTimingFunction(timingFunctionString))
                 keyframe->setEasing(timingFunction);
         }
 
         Vector<String> keyframeProperties;
         keyframeDictionary.getPropertyNames(keyframeProperties);
         for (const auto& property : keyframeProperties) {
@@ skipping 29 matching lines @@
     }
     if (!keyframeEffectModel->isReplaceOnly()) {
         exceptionState.throwDOMException(NotSupportedError, "Additive animations are not supported.");
         return nullptr;
     }
     keyframeEffectModel->forceConversionsToAnimatableValues(*element, element->computedStyle());
 
     return keyframeEffectModel;
 }
 
-PassRefPtrWillBeRawPtr<AnimationEffect> EffectInput::convert(Element* element, const AnimationEffectOrDictionarySequence& effectInput, ExceptionState& exceptionState)
+PassRefPtrWillBeRawPtr<EffectModel> EffectInput::convert(Element* element, const EffectModelOrDictionarySequence& effectInput, ExceptionState& exceptionState)
 {
-    if (effectInput.isAnimationEffect())
-        return effectInput.getAsAnimationEffect();
+    if (effectInput.isEffectModel())
+        return effectInput.getAsEffectModel();
     if (effectInput.isDictionarySequence())
         return convert(element, effectInput.getAsDictionarySequence(), exceptionState);
     return nullptr;
 }
 
 } // namespace blink