From 6f36308ec887b2115e36d2c5db9192f93033f321 Mon Sep 17 00:00:00 2001 From: Hiroyuki Ikezoe Date: Wed, 7 Mar 2018 11:48:35 +0900 Subject: [PATCH] Bug 1443423 - Drop Animation::PauseNoUpdate(). r=birtles CSSTransition still uses PlayNoUpdate(). MozReview-Commit-ID: 5RHSXwaKYV2 --HG-- extra : rebase_source : f8edbe2ebf02fbc7e77f99f0064b2a65a5ae3cd4 --- dom/animation/Animation.cpp | 11 +++-------- dom/animation/Animation.h | 1 - 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/dom/animation/Animation.cpp b/dom/animation/Animation.cpp index e1e2c72aaa83..0535a4e7019e 100644 --- a/dom/animation/Animation.cpp +++ b/dom/animation/Animation.cpp @@ -602,13 +602,6 @@ Animation::Play(ErrorResult& aRv, LimitBehavior aLimitBehavior) PostUpdate(); } -void -Animation::Pause(ErrorResult& aRv) -{ - PauseNoUpdate(aRv); - PostUpdate(); -} - // https://drafts.csswg.org/web-animations/#reverse-an-animation void Animation::Reverse(ErrorResult& aRv) @@ -1224,7 +1217,7 @@ Animation::PlayNoUpdate(ErrorResult& aRv, LimitBehavior aLimitBehavior) // https://drafts.csswg.org/web-animations/#pause-an-animation void -Animation::PauseNoUpdate(ErrorResult& aRv) +Animation::Pause(ErrorResult& aRv) { if (IsPausedOrPausing()) { return; @@ -1271,6 +1264,8 @@ Animation::PauseNoUpdate(ErrorResult& aRv) if (IsRelevant()) { nsNodeUtils::AnimationChanged(this); } + + PostUpdate(); } // https://drafts.csswg.org/web-animations/#play-an-animation diff --git a/dom/animation/Animation.h b/dom/animation/Animation.h index 9af0d96aeca4..29fb6fa366b7 100644 --- a/dom/animation/Animation.h +++ b/dom/animation/Animation.h @@ -406,7 +406,6 @@ protected: void SilentlySetCurrentTime(const TimeDuration& aNewCurrentTime); 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)