diff --git a/dom/animation/Animation.cpp b/dom/animation/Animation.cpp index 7fd7fc4506f5..33c2e84512ca 100644 --- a/dom/animation/Animation.cpp +++ b/dom/animation/Animation.cpp @@ -358,7 +358,7 @@ Animation::GetFinished(ErrorResult& aRv) void Animation::Cancel() { - DoCancel(); + CancelNoUpdate(); PostUpdate(); } @@ -421,14 +421,14 @@ Animation::Finish(ErrorResult& aRv) void Animation::Play(ErrorResult& aRv, LimitBehavior aLimitBehavior) { - DoPlay(aRv, aLimitBehavior); + PlayNoUpdate(aRv, aLimitBehavior); PostUpdate(); } void Animation::Pause(ErrorResult& aRv) { - DoPause(aRv); + PauseNoUpdate(aRv); PostUpdate(); } @@ -662,7 +662,7 @@ Animation::SilentlySetPlaybackRate(double aPlaybackRate) // https://w3c.github.io/web-animations/#cancel-an-animation void -Animation::DoCancel() +Animation::CancelNoUpdate() { if (mPendingState != PendingState::NotPending) { CancelPendingTasks(); @@ -845,7 +845,7 @@ Animation::NotifyEffectTimingUpdated() // https://w3c.github.io/web-animations/#play-an-animation void -Animation::DoPlay(ErrorResult& aRv, LimitBehavior aLimitBehavior) +Animation::PlayNoUpdate(ErrorResult& aRv, LimitBehavior aLimitBehavior) { AutoMutationBatchForAnimation mb(*this); @@ -925,7 +925,7 @@ Animation::DoPlay(ErrorResult& aRv, LimitBehavior aLimitBehavior) // https://w3c.github.io/web-animations/#pause-an-animation void -Animation::DoPause(ErrorResult& aRv) +Animation::PauseNoUpdate(ErrorResult& aRv) { if (IsPausedOrPausing()) { return; @@ -1168,8 +1168,8 @@ Animation::IsPossiblyOrphanedPendingAnimation() const // when we have been painted. // * When we started playing we couldn't find a PendingAnimationTracker to // register with (perhaps the effect had no document) so we simply - // set mPendingState in DoPlay and relied on this method to catch us on the - // next tick. + // set mPendingState in PlayNoUpdate and relied on this method to catch us + // on the next tick. // If we're not pending we're ok. if (mPendingState == PendingState::NotPending) { diff --git a/dom/animation/Animation.h b/dom/animation/Animation.h index 9cca67e0a967..8ff1ef77c8ee 100644 --- a/dom/animation/Animation.h +++ b/dom/animation/Animation.h @@ -144,7 +144,7 @@ public: // Wrapper functions for Animation DOM methods when called from style. - virtual void CancelFromStyle() { DoCancel(); } + virtual void CancelFromStyle() { CancelNoUpdate(); } virtual void Tick(); bool NeedsTicks() const @@ -319,9 +319,9 @@ public: protected: void SilentlySetCurrentTime(const TimeDuration& aNewCurrentTime); void SilentlySetPlaybackRate(double aPlaybackRate); - void DoCancel(); - void DoPlay(ErrorResult& aRv, LimitBehavior aLimitBehavior); - void DoPause(ErrorResult& aRv); + void CancelNoUpdate(); + void PlayNoUpdate(ErrorResult& aRv, LimitBehavior aLimitBehavior); + void PauseNoUpdate(ErrorResult& aRv); void ResumeAt(const TimeDuration& aReadyTime); void PauseAt(const TimeDuration& aReadyTime); void FinishPendingAt(const TimeDuration& aReadyTime) diff --git a/layout/style/nsAnimationManager.cpp b/layout/style/nsAnimationManager.cpp index 1024dfa3f6d3..fdea5dc3059e 100644 --- a/layout/style/nsAnimationManager.cpp +++ b/layout/style/nsAnimationManager.cpp @@ -94,7 +94,7 @@ CSSAnimation::PlayFromStyle() mIsStylePaused = false; if (!mPauseShouldStick) { ErrorResult rv; - DoPlay(rv, Animation::LimitBehavior::Continue); + PlayNoUpdate(rv, Animation::LimitBehavior::Continue); // play() should not throw when LimitBehavior is Continue MOZ_ASSERT(!rv.Failed(), "Unexpected exception playing animation"); } @@ -110,7 +110,7 @@ CSSAnimation::PauseFromStyle() mIsStylePaused = true; ErrorResult rv; - DoPause(rv); + PauseNoUpdate(rv); // pause() should only throw when *all* of the following conditions are true: // - we are in the idle state, and // - we have a negative playback rate, and diff --git a/layout/style/nsTransitionManager.h b/layout/style/nsTransitionManager.h index 90df5094e41c..e71ea677a6db 100644 --- a/layout/style/nsTransitionManager.h +++ b/layout/style/nsTransitionManager.h @@ -141,7 +141,7 @@ public: void PlayFromStyle() { ErrorResult rv; - DoPlay(rv, Animation::LimitBehavior::Continue); + PlayNoUpdate(rv, Animation::LimitBehavior::Continue); // play() should not throw when LimitBehavior is Continue MOZ_ASSERT(!rv.Failed(), "Unexpected exception playing transition"); }