diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-04 01:53:15 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-04 01:53:15 +0000 |
commit | 50e4c49ba64ce680143c83b142ae5a7ec30fde54 (patch) | |
tree | 269a97c1e612c69c97e0a622db091ba5392965c9 /gfx/layers/AnimationInfo.cpp | |
parent | Adding debian version 125.0.2-1. (diff) | |
download | firefox-50e4c49ba64ce680143c83b142ae5a7ec30fde54.tar.xz firefox-50e4c49ba64ce680143c83b142ae5a7ec30fde54.zip |
Merging upstream version 125.0.3.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'gfx/layers/AnimationInfo.cpp')
-rw-r--r-- | gfx/layers/AnimationInfo.cpp | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/gfx/layers/AnimationInfo.cpp b/gfx/layers/AnimationInfo.cpp index 81d11f672c..ad43fd681f 100644 --- a/gfx/layers/AnimationInfo.cpp +++ b/gfx/layers/AnimationInfo.cpp @@ -494,11 +494,15 @@ void AnimationInfo::AddAnimationForProperty( } if (aAnimation->Pending()) { - const TimeStamp readyTime = - aFrame->PresContext()->RefreshDriver()->MostRecentRefresh( - /* aEnsureTimerStarted= */ false); - MOZ_ASSERT(!readyTime.IsNull()); - aAnimation->SetPendingReadyTime(readyTime); + TimeStamp readyTime = aAnimation->GetPendingReadyTime(); + if (readyTime.IsNull()) { + // TODO(emilio): This should generally not happen anymore, can we remove + // this SetPendingReadyTime call? + readyTime = aFrame->PresContext()->RefreshDriver()->MostRecentRefresh( + /* aEnsureTimerStarted= */ false); + MOZ_ASSERT(!readyTime.IsNull()); + aAnimation->SetPendingReadyTime(readyTime); + } MaybeStartPendingAnimation(*animation, readyTime); } } |