Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-10-03 01:59:14 +01:00
Code Issues Projects Releases Packages Wiki Activity

layout: Ensure that the Epoch stored in layout is accurate (#39568)

Browse source 
The first epoch is 0 as that is the one used in the initial transaction,
but the code was setting the first `Epoch` to `Epoch(1)`. This means
that
when layout advanced the epoch, the `Epoch` of the first produced
display list was `Epoch(2)`.

This change makes the value reflected in `current_epoch` actually match
the index of the display list produced. In addition, we always store
this epoch in `PipelineDetails` in the renderer. This will be important
when adding the `WebView::take_screenshot` API.

Testing: This should not change behavior, so is covered by existing
tests which
rely on proper `Epoch` advancement.

Signed-off-by: Martin Robinson <mrobinson@igalia.com>
This commit is contained in:
Martin Robinson 2025-09-30 08:42:58 +02:00 • committed by GitHub
parent 91e4188a64
commit 6a2a9a6e33
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 39 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

19
components/compositing/compositor.rs
View file

@ -221,6 +221,10 @@ pub(crate) struct PipelineDetails {
/// Which parts of Servo have reported that this `Pipeline` has exited. Only when all
/// have done so will it be discarded.
pub exited: PipelineExitSource,
/// The [`Epoch`] of the latest display list received for this `Pipeline` or `None` if no
/// display list has been received.
pub display_list_epoch: Option<Epoch>,
}
impl PipelineDetails {
@ -246,6 +250,7 @@ impl PipelineDetails {
first_paint_metric: PaintMetricState::Waiting,
first_contentful_paint_metric: PaintMetricState::Waiting,
exited: PipelineExitSource::empty(),
display_list_epoch: None,
}
}
@ -537,9 +542,17 @@ impl IOCompositor {
}
},
CompositorMsg::SendInitialTransaction(pipeline) => {
CompositorMsg::SendInitialTransaction(webview_id, pipeline_id) => {
let Some(webview_renderer) = self.webview_renderers.get_mut(webview_id) else {
return warn!("Could not find WebView for incoming display list");
};
let starting_epoch = Epoch(0);
let details = webview_renderer.ensure_pipeline_details(pipeline_id.into());
details.display_list_epoch = Some(starting_epoch);
let mut txn = Transaction::new();
txn.set_display_list(WebRenderEpoch(0), (pipeline, Default::default()));
txn.set_display_list(starting_epoch.into(), (pipeline_id, Default::default()));
self.generate_frame(&mut txn, RenderReasons::SCENE);
self.global.borrow_mut().send_transaction(txn);
},
@ -653,6 +666,8 @@ impl IOCompositor {
Some(display_list_info.viewport_details.hidpi_scale_factor);
let epoch = display_list_info.epoch;
details.display_list_epoch = Some(Epoch(epoch.0));
let first_reflow = display_list_info.first_reflow;
if details.first_paint_metric == PaintMetricState::Waiting {
details.first_paint_metric = PaintMetricState::Seen(epoch, first_reflow);