mirror of
https://github.com/servo/servo.git
synced 2025-07-22 23:03:42 +01:00
9c0561536d
* script: Do not run layout in a thread Instead of spawning a thread for layout that almost always runs synchronously with script, simply run layout in the script thread. This is a resurrection of #28708, taking just the bits that remove the layout thread. It's a complex change and thus is just a first step toward cleaning up the interface between script and layout. Messages are still passed from script to layout via a `process()` method and script proxies some messages to layout from other threads as well. Big changes: 1. Layout is created in the script thread on Document load, thus every live document is guaranteed to have a layout. This isn't completely hidden in the interface, but we can safely `unwrap()` on a Document's layout. 2. Layout configuration is abstracted away into a LayoutConfig struct and the LayoutFactory is a struct passed around by the Constellation. This is to avoid having to monomorphize the entire script thread for each layout. 3. Instead of having the Constellation block on the layout thread to figure out the current epoch and whether there are pending web fonts loading, updates are sent synchronously to the Constellation when rendering to a screenshot. This practically only used by the WPT. A couple tests start to fail, which is probably inevitable since removing the layout thread has introduced timing changes in "exit after load" and screenshot behavior. Co-authored-by: Josh Matthews <josh@joshmatthews.net> * Update test expectations * Fix some issues found during review * Clarify some comments * Address review comments --------- Co-authored-by: Josh Matthews <josh@joshmatthews.net>
124 lines
3.6 KiB
Rust
124 lines
3.6 KiB
Rust
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at https://mozilla.org/MPL/2.0/. */
|
|
|
|
use gfx_traits::Epoch;
|
|
use ipc_channel::ipc;
|
|
use metrics::{PaintTimeMetrics, ProfilerMetadataFactory, ProgressiveWebMetric};
|
|
use msg::constellation_msg::TEST_PIPELINE_ID;
|
|
use profile_traits::time::{ProfilerChan, TimerMetadata};
|
|
use servo_url::ServoUrl;
|
|
|
|
struct DummyProfilerMetadataFactory {}
|
|
impl ProfilerMetadataFactory for DummyProfilerMetadataFactory {
|
|
fn new_metadata(&self) -> Option<TimerMetadata> {
|
|
None
|
|
}
|
|
}
|
|
|
|
#[test]
|
|
fn test_paint_metrics_construction() {
|
|
let (sender, _) = ipc::channel().unwrap();
|
|
let profiler_chan = ProfilerChan(sender);
|
|
let (layout_sender, _) = ipc::channel().unwrap();
|
|
let (script_sender, _) = ipc::channel().unwrap();
|
|
let paint_time_metrics = PaintTimeMetrics::new(
|
|
TEST_PIPELINE_ID,
|
|
profiler_chan,
|
|
layout_sender,
|
|
script_sender,
|
|
ServoUrl::parse("about:blank").unwrap(),
|
|
0,
|
|
);
|
|
assert_eq!(
|
|
(&paint_time_metrics).get_navigation_start(),
|
|
Some(0),
|
|
"navigation start is set properly"
|
|
);
|
|
assert_eq!(
|
|
paint_time_metrics.get_first_paint(),
|
|
None,
|
|
"first paint is None"
|
|
);
|
|
assert_eq!(
|
|
paint_time_metrics.get_first_contentful_paint(),
|
|
None,
|
|
"first contentful paint is None"
|
|
);
|
|
}
|
|
|
|
fn test_common(display_list_is_contentful: bool, epoch: Epoch) -> PaintTimeMetrics {
|
|
let (sender, _) = ipc::channel().unwrap();
|
|
let profiler_chan = ProfilerChan(sender);
|
|
let (layout_sender, _) = ipc::channel().unwrap();
|
|
let (script_sender, _) = ipc::channel().unwrap();
|
|
let mut paint_time_metrics = PaintTimeMetrics::new(
|
|
TEST_PIPELINE_ID,
|
|
profiler_chan,
|
|
layout_sender,
|
|
script_sender,
|
|
ServoUrl::parse("about:blank").unwrap(),
|
|
0,
|
|
);
|
|
let dummy_profiler_metadata_factory = DummyProfilerMetadataFactory {};
|
|
|
|
paint_time_metrics.maybe_observe_paint_time(
|
|
&dummy_profiler_metadata_factory,
|
|
epoch,
|
|
display_list_is_contentful,
|
|
);
|
|
|
|
assert_eq!(
|
|
paint_time_metrics.get_first_paint(),
|
|
None,
|
|
"first paint is None"
|
|
);
|
|
assert_eq!(
|
|
paint_time_metrics.get_first_contentful_paint(),
|
|
None,
|
|
"first contentful paint is None"
|
|
);
|
|
|
|
let navigation_start = time::precise_time_ns();
|
|
paint_time_metrics.set_navigation_start(navigation_start);
|
|
assert_eq!(
|
|
(&paint_time_metrics).get_navigation_start().unwrap(),
|
|
navigation_start,
|
|
"navigation start is set"
|
|
);
|
|
|
|
paint_time_metrics
|
|
}
|
|
|
|
#[test]
|
|
fn test_first_paint_setter() {
|
|
let epoch = Epoch(0);
|
|
let paint_time_metrics = test_common(false, epoch);
|
|
let now = time::precise_time_ns();
|
|
paint_time_metrics.maybe_set_metric(epoch, now);
|
|
assert!(
|
|
paint_time_metrics.get_first_paint().is_some(),
|
|
"first paint is set"
|
|
);
|
|
assert_eq!(
|
|
paint_time_metrics.get_first_contentful_paint(),
|
|
None,
|
|
"first contentful paint is None"
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn test_first_contentful_paint_setter() {
|
|
let epoch = Epoch(0);
|
|
let paint_time_metrics = test_common(true, epoch);
|
|
let now = time::precise_time_ns();
|
|
paint_time_metrics.maybe_set_metric(epoch, now);
|
|
assert!(
|
|
paint_time_metrics.get_first_contentful_paint().is_some(),
|
|
"first contentful paint is set"
|
|
);
|
|
assert!(
|
|
paint_time_metrics.get_first_paint().is_some(),
|
|
"first paint is set"
|
|
);
|
|
}
|