From 97abad403c5e0d6ed2e747da925980a868fc4ca3 Mon Sep 17 00:00:00 2001 From: Brian Birtles Date: Fri, 7 Aug 2015 12:29:36 +0900 Subject: [PATCH] Bug 1181392 part 10 - Remove KeyframeEffect::IsFinishedTransition; r=dbaron --- dom/animation/Animation.cpp | 3 --- dom/animation/KeyframeEffect.h | 18 ------------------ 2 files changed, 21 deletions(-) diff --git a/dom/animation/Animation.cpp b/dom/animation/Animation.cpp index 29f96e5ae7a..ae704df408f 100644 --- a/dom/animation/Animation.cpp +++ b/dom/animation/Animation.cpp @@ -912,9 +912,6 @@ Animation::UpdateFinishedState(SeekFlag aSeekFlag, DoFinishNotification(aSyncNotifyFlag); } else if (!currentFinishedState && mFinishedIsResolved) { ResetFinishedPromise(); - if (mEffect->AsTransition()) { - mEffect->SetIsFinishedTransition(false); - } } // We must recalculate the current time to take account of any mHoldTime // changes the code above made. diff --git a/dom/animation/KeyframeEffect.h b/dom/animation/KeyframeEffect.h index 23289f31ae4..5308244ae41 100644 --- a/dom/animation/KeyframeEffect.h +++ b/dom/animation/KeyframeEffect.h @@ -196,7 +196,6 @@ public: : AnimationEffectReadOnly(aDocument) , mTarget(aTarget) , mTiming(aTiming) - , mIsFinishedTransition(false) , mPseudoType(aPseudoType) { MOZ_ASSERT(aTarget, "null animation target is not yet supported"); @@ -282,20 +281,6 @@ public: static StickyTimeDuration ActiveDuration(const AnimationTiming& aTiming); - // After transitions finish they need to be retained in order to - // address the issue described in - // https://lists.w3.org/Archives/Public/www-style/2015Jan/0444.html . - // However, finished transitions are ignored for many purposes. - bool IsFinishedTransition() const { - return mIsFinishedTransition; - } - - void SetIsFinishedTransition(bool aIsFinished) { - MOZ_ASSERT(AsTransition(), - "Calling SetIsFinishedTransition but it's not a transition"); - mIsFinishedTransition = aIsFinished; - } - bool IsInPlay(const Animation& aAnimation) const; bool IsCurrent(const Animation& aAnimation) const; bool IsInEffect() const; @@ -328,9 +313,6 @@ protected: Nullable mParentTime; AnimationTiming mTiming; - // A flag to mark transitions that have finished and are due to - // be removed on the next throttle-able cycle. - bool mIsFinishedTransition; nsCSSPseudoElements::Type mPseudoType; InfallibleTArray mProperties;