Bug 1474766 - Drop KeyframeEffectType template arg; r=hiro

This is no longer needed since in bug 1456394 we merged the two types of
KeyframeEffects into one.

MozReview-Commit-ID: 8IuTD9ivAGK

--HG--
extra : rebase_source : b14593b33bfa9a0233b524010b3bde3cfc078950

dom/animation/KeyframeEffect.cpp

@@ -634,8 +634,8 @@ KeyframeEffect::ConvertTarget(
   return result;
 }
 
-template <class KeyframeEffectType, class OptionsType>
-/* static */ already_AddRefed<KeyframeEffectType>
+template <class OptionsType>
+/* static */ already_AddRefed<KeyframeEffect>
 KeyframeEffect::ConstructKeyframeEffect(
     const GlobalObject& aGlobal,
     const Nullable<ElementOrCSSPseudoElement>& aTarget,
@@ -668,8 +668,8 @@ KeyframeEffect::ConstructKeyframeEffect(
     KeyframeEffectParamsFromUnion(aOptions, aGlobal.CallerType());
 
   Maybe<OwningAnimationTarget> target = ConvertTarget(aTarget);
-  RefPtr<KeyframeEffectType> effect =
-    new KeyframeEffectType(doc, target, timingParams, effectOptions);
+  RefPtr<KeyframeEffect> effect =
+    new KeyframeEffect(doc, target, timingParams, effectOptions);
 
   effect->SetKeyframes(aGlobal.Context(), aKeyframes, aRv);
   if (aRv.Failed()) {
@@ -679,8 +679,7 @@ KeyframeEffect::ConstructKeyframeEffect(
   return effect.forget();
 }
 
-template<class KeyframeEffectType>
-/* static */ already_AddRefed<KeyframeEffectType>
+/* static */ already_AddRefed<KeyframeEffect>
 KeyframeEffect::ConstructKeyframeEffect(const GlobalObject& aGlobal,
                                         KeyframeEffect& aSource,
                                         ErrorResult& aRv)
@@ -697,11 +696,11 @@ KeyframeEffect::ConstructKeyframeEffect(const GlobalObject& aGlobal,
   // aSource's TimingParams.
   // Note: we don't need to re-throw exceptions since the value specified on
   //       aSource's timing object can be assumed valid.
-  RefPtr<KeyframeEffectType> effect =
-    new KeyframeEffectType(doc,
-                           aSource.mTarget,
-                           aSource.SpecifiedTiming(),
-                           aSource.mEffectOptions);
+  RefPtr<KeyframeEffect> effect =
+    new KeyframeEffect(doc,
+                       aSource.mTarget,
+                       aSource.SpecifiedTiming(),
+                       aSource.mEffectOptions);
   // Copy cumulative change hint. mCumulativeChangeHint should be the same as
   // the source one because both of targets are the same.
   effect->mCumulativeChangeHint = aSource.mCumulativeChangeHint;
@@ -882,8 +881,7 @@ KeyframeEffect::Constructor(
     const UnrestrictedDoubleOrKeyframeEffectOptions& aOptions,
     ErrorResult& aRv)
 {
-  return ConstructKeyframeEffect<KeyframeEffect>(aGlobal, aTarget,
-                                                 aKeyframes, aOptions, aRv);
+  return ConstructKeyframeEffect(aGlobal, aTarget, aKeyframes, aOptions, aRv);
 }
 
 /* static */ already_AddRefed<KeyframeEffect>
@@ -891,7 +889,7 @@ KeyframeEffect::Constructor(const GlobalObject& aGlobal,
                             KeyframeEffect& aSource,
                             ErrorResult& aRv)
 {
-  return ConstructKeyframeEffect<KeyframeEffect>(aGlobal, aSource, aRv);
+  return ConstructKeyframeEffect(aGlobal, aSource, aRv);
 }
 
 /* static */ already_AddRefed<KeyframeEffect>
@@ -902,8 +900,7 @@ KeyframeEffect::Constructor(
     const UnrestrictedDoubleOrKeyframeAnimationOptions& aOptions,
     ErrorResult& aRv)
 {
-  return ConstructKeyframeEffect<KeyframeEffect>(aGlobal, aTarget, aKeyframes,
-                                                 aOptions, aRv);
+  return ConstructKeyframeEffect(aGlobal, aTarget, aKeyframes, aOptions, aRv);
 }
 
 void

dom/animation/KeyframeEffect.h

@@ -305,16 +305,15 @@ protected:
   static Maybe<OwningAnimationTarget>
   ConvertTarget(const Nullable<ElementOrCSSPseudoElement>& aTarget);
 
-  template<class KeyframeEffectType, class OptionsType>
-  static already_AddRefed<KeyframeEffectType>
+  template<class OptionsType>
+  static already_AddRefed<KeyframeEffect>
   ConstructKeyframeEffect(const GlobalObject& aGlobal,
                           const Nullable<ElementOrCSSPseudoElement>& aTarget,
                           JS::Handle<JSObject*> aKeyframes,
                           const OptionsType& aOptions,
                           ErrorResult& aRv);
 
-  template<class KeyframeEffectType>
-  static already_AddRefed<KeyframeEffectType>
+  static already_AddRefed<KeyframeEffect>
   ConstructKeyframeEffect(const GlobalObject& aGlobal,
                           KeyframeEffect& aSource,
                           ErrorResult& aRv);