Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Commit pending playback rate when auto aligning #243

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

Commit pending playback rate when auto aligning #243

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ab6f21a
Realign start time if finite timeline and auto-rewind is true
johannesodland Feb 8, 2024
2ce10d1
Commit the pending playback rate when auto aligning the start time
johannesodland Feb 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions src/proxy-animation.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -572,10 +572,13 @@ function playInternal(details, autoRewind) {
}

// Not by spec, but required by tests in play-animation.html:
// – Playing a running animation resets a sticky start time
// - Playing a finished animation restarts the animation aligned at the start
// - Playing a pause-pending but previously finished animation realigns with the scroll position
// - Playing a finished animation clears the start time
if (details.proxy.playState === 'finished' || abortedPause) {
// - Resuming an animation from paused realigns with scroll position.
// These tests suggest that the start time should always be auto aligned when auto-rewind and finite timeline is true
if (autoRewind) {
details.holdTime = null
details.startTime = null
details.autoAlignStartTime = true;
Expand Down Expand Up @@ -918,7 +921,9 @@ function autoAlignStartTime(details) {
// TODO: Clarify how range duration should be resolved
details.rangeDuration = endOffset.value - startOffset.value;
// 7. Set start time to start offset if effective playback rate ≥ 0, and end offset otherwise.
const playbackRate = effectivePlaybackRate(details);
// Not by spec: Applying the pending playback rate. If not, the start time will be re-aligned in `commitPendingPlay()`
applyPendingPlaybackRate(details);
const playbackRate = details.animation.playbackRate;
details.startTime = fromCssNumberish(details,playbackRate >= 0 ? startOffset : endOffset);

// 8. Clear hold time.
Expand Down
8 changes: 4 additions & 4 deletions test/expected.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -829,21 +829,21 @@ FAIL /scroll-animations/scroll-timelines/play-animation.html Playing an animatio
PASS /scroll-animations/scroll-timelines/play-animation.html Playing an animations with a negative playback rate aligns the start time with the end of the active range
PASS /scroll-animations/scroll-timelines/play-animation.html Start time set while play pending is preserved.
PASS /scroll-animations/scroll-timelines/play-animation.html Current time set while play pending is preserved.
FAIL /scroll-animations/scroll-timelines/play-animation.html Playing a running animation resets a sticky start time
PASS /scroll-animations/scroll-timelines/play-animation.html Playing a running animation resets a sticky start time
PASS /scroll-animations/scroll-timelines/play-animation.html Playing a finished animation restarts the animation aligned at the start
PASS /scroll-animations/scroll-timelines/play-animation.html Playing a finished and reversed animation restarts the animation aligned at the end
PASS /scroll-animations/scroll-timelines/play-animation.html Playing a pause-pending but previously finished animation realigns with the scroll position
PASS /scroll-animations/scroll-timelines/play-animation.html Playing a finished animation clears the start time
PASS /scroll-animations/scroll-timelines/play-animation.html The ready promise should be replaced if the animation is not already pending
PASS /scroll-animations/scroll-timelines/play-animation.html A pending ready promise should be resolved and not replaced when the animation enters the running state
FAIL /scroll-animations/scroll-timelines/play-animation.html Resuming an animation from paused realigns with scroll position.
PASS /scroll-animations/scroll-timelines/play-animation.html Resuming an animation from paused realigns with scroll position.
PASS /scroll-animations/scroll-timelines/play-animation.html If a pause operation is interrupted, the ready promise is reused
FAIL /scroll-animations/scroll-timelines/play-animation.html A pending playback rate is used when determining timeline range alignment
PASS /scroll-animations/scroll-timelines/play-animation.html A pending playback rate is used when determining timeline range alignment
PASS /scroll-animations/scroll-timelines/play-animation.html Playing a canceled animation sets the start time
PASS /scroll-animations/scroll-timelines/play-animation.html Playing a canceled animation backwards sets the start time
PASS /scroll-animations/scroll-timelines/reverse-animation.html Setting current time while reverse-pending preserves currentTime
PASS /scroll-animations/scroll-timelines/reverse-animation.html Reversing an animation inverts the playback rate
FAIL /scroll-animations/scroll-timelines/reverse-animation.html Reversing an animation resets a sticky start time.
PASS /scroll-animations/scroll-timelines/reverse-animation.html Reversing an animation resets a sticky start time.
PASS /scroll-animations/scroll-timelines/reverse-animation.html Reversing an animation does not cause it to leave the pending state
PASS /scroll-animations/scroll-timelines/reverse-animation.html Reversing an animation does not cause it to resolve the ready promise
PASS /scroll-animations/scroll-timelines/reverse-animation.html Reversing an animation with a negative playback rate should cause the animation to play in a forward direction
Expand Down
Loading