diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-04 01:54:08 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-04 01:54:08 +0000 |
| commit | 7443e3d6139ce4f0c822c23d1efb9c097419456d (patch) | |
| tree | 8e2682b680f95eb05e7f15551464dd1a671b06e2 /gfx/layers | |
| parent | Releasing progress-linux version 125.0.2-1~progress7.99u1. (diff) | |
| download | firefox-7443e3d6139ce4f0c822c23d1efb9c097419456d.tar.xz firefox-7443e3d6139ce4f0c822c23d1efb9c097419456d.zip | |
Merging upstream version 125.0.3.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'gfx/layers')
| -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); } } |