Bug 1292001 - Drop ElementPropertyTransition; r=boris

Differential Revision: https://phabricator.services.mozilla.com/D64523 --HG-- extra : moz-landing-system : lando
dothq · Mar 2, 2020 · 1ed864c · 1ed864c
1 parent 47e8e27
commit 1ed864c
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 39 deletions.
diff --git a/dom/animation/AnimationEffect.h b/dom/animation/AnimationEffect.h
@@ -18,9 +18,6 @@
 #include "nsWrapperCache.h"
 
 namespace mozilla {
-
-struct ElementPropertyTransition;
-
 namespace dom {
 
 class Animation;
@@ -37,11 +34,6 @@ class AnimationEffect : public nsISupports, public nsWrapperCache {
 
   virtual KeyframeEffect* AsKeyframeEffect() { return nullptr; }
 
-  virtual ElementPropertyTransition* AsTransition() { return nullptr; }
-  virtual const ElementPropertyTransition* AsTransition() const {
-    return nullptr;
-  }
-
   nsISupports* GetParentObject() const { return ToSupports(mDocument); }
 
   bool IsCurrent() const;

diff --git a/dom/animation/KeyframeEffect.h b/dom/animation/KeyframeEffect.h
@@ -101,8 +101,6 @@ struct AnimationProperty {
                              const dom::Element* aElement);
 };
 
-struct ElementPropertyTransition;
-
 namespace dom {
 
 class Animation;

diff --git a/layout/style/nsTransitionManager.cpp b/layout/style/nsTransitionManager.cpp
@@ -668,19 +668,15 @@ bool nsTransitionManager::ConsiderInitiatingTransition(
                        startValue.IsInterpolableWith(aProperty, endValue);
 
   bool haveCurrentTransition = false;
-  size_t currentIndex = nsTArray<ElementPropertyTransition>::NoIndex;
+  size_t currentIndex = nsTArray<KeyframeEffect>::NoIndex;
   const CSSTransition* oldTransition = nullptr;
-  const ElementPropertyTransition* oldPT = nullptr;
   if (aElementTransitions) {
     OwningCSSTransitionPtrArray& animations = aElementTransitions->mAnimations;
     for (size_t i = 0, i_end = animations.Length(); i < i_end; ++i) {
       if (animations[i]->TransitionProperty() == aProperty) {
         haveCurrentTransition = true;
         currentIndex = i;
         oldTransition = animations[i];
-        oldPT = oldTransition->GetEffect()
-                    ? oldTransition->GetEffect()->AsTransition()
-                    : nullptr;
         break;
       }
     }
@@ -717,8 +713,7 @@ bool nsTransitionManager::ConsiderInitiatingTransition(
       OwningCSSTransitionPtrArray& animations =
           aElementTransitions->mAnimations;
       animations[currentIndex]->CancelFromStyle(PostRestyleMode::IfNeeded);
-      oldPT = nullptr;  // Clear pointer so it doesn't dangle
-      oldTransition = nullptr;
+      oldTransition = nullptr;  // Clear pointer so it doesn't dangle
       animations.RemoveElementAt(currentIndex);
       EffectSet* effectSet = EffectSet::GetEffectSet(aElement, aPseudoType);
       if (effectSet) {
@@ -788,21 +783,22 @@ bool nsTransitionManager::ConsiderInitiatingTransition(
   }
 
   KeyframeEffectParams effectOptions;
-  RefPtr<ElementPropertyTransition> pt = new ElementPropertyTransition(
+  RefPtr<KeyframeEffect> keyframeEffect = new KeyframeEffect(
       aElement->OwnerDoc(), OwningAnimationTarget(aElement, aPseudoType),
       std::move(timing), effectOptions);
 
-  pt->SetKeyframes(GetTransitionKeyframes(aProperty, std::move(startValue),
-                                          std::move(endValue)),
-                   &aNewStyle);
+  keyframeEffect->SetKeyframes(
+      GetTransitionKeyframes(aProperty, std::move(startValue),
+                             std::move(endValue)),
+      &aNewStyle);
 
   RefPtr<CSSTransition> animation =
       new CSSTransition(mPresContext->Document()->GetScopeObject());
   animation->SetOwningElement(OwningElementRef(*aElement, aPseudoType));
   animation->SetTimelineNoUpdate(timeline);
   animation->SetCreationSequence(
       mPresContext->RestyleManager()->GetAnimationGeneration());
-  animation->SetEffectFromStyle(pt);
+  animation->SetEffectFromStyle(keyframeEffect);
   animation->SetReverseParameters(std::move(startForReversingTest),
                                   reversePortion);
   animation->PlayFromStyle();
@@ -846,8 +842,7 @@ bool nsTransitionManager::ConsiderInitiatingTransition(
     }
 
     animations[currentIndex]->CancelFromStyle(PostRestyleMode::IfNeeded);
-    oldPT = nullptr;  // Clear pointer so it doesn't dangle
-    oldTransition = nullptr;
+    oldTransition = nullptr;  // Clear pointer so it doesn't dangle
     animations[currentIndex] = animation;
   } else {
     if (!animations.AppendElement(animation)) {

diff --git a/layout/style/nsTransitionManager.h b/layout/style/nsTransitionManager.h
@@ -32,21 +32,6 @@ struct StyleTransition;
  *****************************************************************************/
 
 namespace mozilla {
-
-struct ElementPropertyTransition : public dom::KeyframeEffect {
-  ElementPropertyTransition(dom::Document* aDocument,
-                            OwningAnimationTarget&& aTarget,
-                            TimingParams&& aTiming,
-                            const KeyframeEffectParams& aEffectOptions)
-      : dom::KeyframeEffect(aDocument, std::move(aTarget), std::move(aTiming),
-                            aEffectOptions) {}
-
-  ElementPropertyTransition* AsTransition() override { return this; }
-  const ElementPropertyTransition* AsTransition() const override {
-    return this;
-  }
-};
-
 namespace dom {
 
 class CSSTransition final : public Animation {