mirror of
https://github.com/servo/servo.git
synced 2025-08-05 13:40:08 +01:00
Auto merge of #18155 - ferjm:pwm.perf.timeline, r=jdm
Add paint metrics to Performance Timeline API - [X] `./mach build -d` does not report any errors - [X] `./mach test-tidy` does not report any errors - [X] These changes fix #18111 - [X] There are tests for these changes <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/18155) <!-- Reviewable:end -->
This commit is contained in:
commit
173079c144
15 changed files with 152 additions and 20 deletions
|
@ -401,6 +401,7 @@ pub mod performance;
|
|||
pub mod performanceentry;
|
||||
pub mod performanceobserver;
|
||||
pub mod performanceobserverentrylist;
|
||||
pub mod performancepainttiming;
|
||||
pub mod performancetiming;
|
||||
pub mod permissions;
|
||||
pub mod permissionstatus;
|
||||
|
|
|
@ -21,10 +21,10 @@ pub struct PerformanceEntry {
|
|||
}
|
||||
|
||||
impl PerformanceEntry {
|
||||
fn new_inherited(name: DOMString,
|
||||
entry_type: DOMString,
|
||||
start_time: f64,
|
||||
duration: f64) -> PerformanceEntry {
|
||||
pub fn new_inherited(name: DOMString,
|
||||
entry_type: DOMString,
|
||||
start_time: f64,
|
||||
duration: f64) -> PerformanceEntry {
|
||||
PerformanceEntry {
|
||||
reflector_: Reflector::new(),
|
||||
name,
|
||||
|
|
|
@ -27,7 +27,7 @@ const VALID_ENTRY_TYPES: &'static [&'static str] = &[
|
|||
// "measure", XXX User Timing API
|
||||
// "resource", XXX Resource Timing API
|
||||
// "server", XXX Server Timing API
|
||||
// "paint", XXX Paint Timing API
|
||||
"paint", // Paint Timing API
|
||||
];
|
||||
|
||||
#[dom_struct]
|
||||
|
|
41
components/script/dom/performancepainttiming.rs
Normal file
41
components/script/dom/performancepainttiming.rs
Normal file
|
@ -0,0 +1,41 @@
|
|||
/* 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 http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
use dom::bindings::codegen::Bindings::PerformancePaintTimingBinding;
|
||||
use dom::bindings::js::Root;
|
||||
use dom::bindings::reflector::reflect_dom_object;
|
||||
use dom::bindings::str::DOMString;
|
||||
use dom::globalscope::GlobalScope;
|
||||
use dom::performanceentry::PerformanceEntry;
|
||||
use dom_struct::dom_struct;
|
||||
use script_traits::PaintMetricType;
|
||||
|
||||
#[dom_struct]
|
||||
pub struct PerformancePaintTiming {
|
||||
entry: PerformanceEntry,
|
||||
}
|
||||
|
||||
impl PerformancePaintTiming {
|
||||
fn new_inherited(metric_type: PaintMetricType, start_time: f64)
|
||||
-> PerformancePaintTiming {
|
||||
let name = match metric_type {
|
||||
PaintMetricType::FirstPaint => DOMString::from("first-paint"),
|
||||
PaintMetricType::FirstContentfulPaint => DOMString::from("first-contentful-paint"),
|
||||
};
|
||||
PerformancePaintTiming {
|
||||
entry: PerformanceEntry::new_inherited(name,
|
||||
DOMString::from("paint"),
|
||||
start_time,
|
||||
0.)
|
||||
}
|
||||
}
|
||||
|
||||
#[allow(unrooted_must_root)]
|
||||
pub fn new(global: &GlobalScope,
|
||||
metric_type: PaintMetricType,
|
||||
start_time: f64) -> Root<PerformancePaintTiming> {
|
||||
let entry = PerformancePaintTiming::new_inherited(metric_type, start_time);
|
||||
reflect_dom_object(box entry, global, PerformancePaintTimingBinding::Wrap)
|
||||
}
|
||||
}
|
11
components/script/dom/webidls/PerformancePaintTiming.webidl
Normal file
11
components/script/dom/webidls/PerformancePaintTiming.webidl
Normal file
|
@ -0,0 +1,11 @@
|
|||
/* 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 http://mozilla.org/MPL/2.0/.
|
||||
*
|
||||
* The origin of this IDL file is
|
||||
* https://wicg.github.io/paint-timing/#sec-PerformancePaintTiming
|
||||
*/
|
||||
|
||||
[Exposed=(Window,Worker)]
|
||||
interface PerformancePaintTiming : PerformanceEntry {
|
||||
};
|
|
@ -49,6 +49,8 @@ use dom::htmlanchorelement::HTMLAnchorElement;
|
|||
use dom::htmliframeelement::{HTMLIFrameElement, NavigationType};
|
||||
use dom::mutationobserver::MutationObserver;
|
||||
use dom::node::{Node, NodeDamage, window_from_node, from_untrusted_node_address};
|
||||
use dom::performanceentry::PerformanceEntry;
|
||||
use dom::performancepainttiming::PerformancePaintTiming;
|
||||
use dom::serviceworker::TrustedServiceWorkerAddress;
|
||||
use dom::serviceworkerregistration::ServiceWorkerRegistration;
|
||||
use dom::servoparser::{ParserContext, ServoParser};
|
||||
|
@ -85,7 +87,7 @@ use profile_traits::time::{self, ProfilerCategory, profile};
|
|||
use script_layout_interface::message::{self, Msg, NewLayoutThreadInfo, ReflowQueryType};
|
||||
use script_runtime::{CommonScriptMsg, ScriptChan, ScriptThreadEventCategory};
|
||||
use script_runtime::{ScriptPort, StackRootTLS, get_reports, new_rt_and_cx};
|
||||
use script_traits::{CompositorEvent, ConstellationControlMsg};
|
||||
use script_traits::{CompositorEvent, ConstellationControlMsg, PaintMetricType};
|
||||
use script_traits::{DocumentActivity, DiscardBrowsingContext, EventResult};
|
||||
use script_traits::{InitialScriptState, LayoutMsg, LoadData, MouseButton, MouseEventType, MozBrowserEvent};
|
||||
use script_traits::{NewLayoutInfo, ScriptToConstellationChan, ScriptMsg, UpdatePipelineIdReason};
|
||||
|
@ -1261,6 +1263,8 @@ impl ScriptThread {
|
|||
self.handle_exit_pipeline_msg(pipeline_id, discard_browsing_context),
|
||||
ConstellationControlMsg::WebVREvents(pipeline_id, events) =>
|
||||
self.handle_webvr_events(pipeline_id, events),
|
||||
ConstellationControlMsg::PaintMetric(pipeline_id, metric_type, metric_value) =>
|
||||
self.handle_paint_metric(pipeline_id, metric_type, metric_value),
|
||||
msg @ ConstellationControlMsg::AttachLayout(..) |
|
||||
msg @ ConstellationControlMsg::Viewport(..) |
|
||||
msg @ ConstellationControlMsg::SetScrollState(..) |
|
||||
|
@ -1482,7 +1486,8 @@ impl ScriptThread {
|
|||
layout_threads: layout_threads,
|
||||
paint_time_metrics: PaintTimeMetrics::new(new_pipeline_id,
|
||||
self.time_profiler_chan.clone(),
|
||||
self.layout_to_constellation_chan.clone()),
|
||||
self.layout_to_constellation_chan.clone(),
|
||||
self.control_chan.clone()),
|
||||
});
|
||||
|
||||
// Pick a layout thread, any layout thread
|
||||
|
@ -2485,6 +2490,19 @@ impl ScriptThread {
|
|||
}
|
||||
}
|
||||
|
||||
fn handle_paint_metric(&self,
|
||||
pipeline_id: PipelineId,
|
||||
metric_type: PaintMetricType,
|
||||
metric_value: f64) {
|
||||
let window = self.documents.borrow().find_window(pipeline_id);
|
||||
if let Some(window) = window {
|
||||
let entry = PerformancePaintTiming::new(&window.upcast::<GlobalScope>(),
|
||||
metric_type, metric_value);
|
||||
window.Performance().queue_entry(&entry.upcast::<PerformanceEntry>(),
|
||||
true /* buffer performance entry */);
|
||||
}
|
||||
}
|
||||
|
||||
pub fn enqueue_microtask(job: Microtask) {
|
||||
SCRIPT_THREAD_ROOT.with(|root| {
|
||||
let script_thread = unsafe { &*root.get().unwrap() };
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue