Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-06 16:45:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

script: reset spurious frame counter *only* when reflow is triggered (#35435)

Browse source 
I had applied a review suggestion in the previous PR to combine the
nested conditions, but this is wrong as this meant the spurious frame
callback was getting reset not just when the reflow was triggered by the
callback, but also each time the counter reached the threshold.

The test added in the previous PR also had issues with the upstream WPT
repo's lint checks - `test.step_timeout` should be used instead of the
`setTimeout` function.

This patch fixes the counter update logic and also addresses the linting
issue caught by upstream's linter.

Signed-off-by: Mukilan Thiyagarajan <mukilan@igalia.com>
This commit is contained in:
Mukilan Thiyagarajan 2025-02-12 19:53:55 +05:30 • committed by GitHub
parent 695e5fe5f1
commit b7b8619e87
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 27 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

7
components/script/dom/document.rs
View file

@ -2403,9 +2403,10 @@ impl Document {
// Update the counter of spurious animation frames.
let spurious_frames = self.spurious_animation_frames.get();
if callbacks_did_not_trigger_reflow && spurious_frames < SPURIOUS_ANIMATION_FRAME_THRESHOLD
{
self.spurious_animation_frames.set(spurious_frames + 1);
if callbacks_did_not_trigger_reflow {
if spurious_frames < SPURIOUS_ANIMATION_FRAME_THRESHOLD {
self.spurious_animation_frames.set(spurious_frames + 1);
}
} else {
self.spurious_animation_frames.set(0);
}

2
tests/wpt/meta/MANIFEST.json vendored
View file

@ -729603,7 +729603,7 @@
]
],
"spurious-frame-callbacks-optimization.html": [
"b4c582cd5edce8f92a2da0b44131a8dbdff60f11",
"82fbe12db546dd52e2e17d55fd5286b55ca2e7fe",
[
null,
{}

44
tests/wpt/tests/html/webappapis/animation-frames/spurious-frame-callbacks-optimization.html vendored
View file

@ -10,30 +10,30 @@
</body>
<script>
"use strict";
let frame = 0;
const draw = (t) => {
frame += 1;
if (frame < 11) {
// Don't mutate the DOM for 10 frames to meet the threshold for Servo's
// spurious frame optimization to kick in.
requestAnimationFrame(draw);
} else if (frame == 11) {
// Don't schedule next rAF so the compositor's tick is disabled.
// This is specific to Servo as the spurious frame detection at the
// time of this test was broken.
setTimeout(() => {
requestAnimationFrame(draw);
}, 10);
} else {
// Normal frames.
document.getElementById('target').innerText = t;
requestAnimationFrame(draw);
}
};
async_test(function(test) {
let frame = 0;
const draw = (t) => {
frame += 1;
if (frame < 11) {
// Don't mutate the DOM for 10 frames to meet the threshold for Servo's
// spurious frame optimization to kick in.
requestAnimationFrame(draw);
} else if (frame == 11) {
// Don't schedule next rAF so the compositor's tick is disabled.
// This is specific to Servo as the spurious frame detection at the
// time of this test was broken.
test.step_timeout(() => {
requestAnimationFrame(draw);
}, 0);
} else {
// Normal frames.
document.getElementById('target').innerText = t;
requestAnimationFrame(draw);
}
};
let target = document.getElementById('target');
setTimeout(test.step_func_done(() => {
test.step_timeout(test.step_func_done(() => {
assert_greater_than(parseInt(target.innerText), 500);
}), 550);
requestAnimationFrame(draw);