mirror of
https://github.com/servo/servo.git
synced 2025-08-03 04:30:10 +01:00
Report errors using the top-level frame id rather than the pipeline id.
This commit is contained in:
parent
22aebdf5d4
commit
c228a4cf03
9 changed files with 203 additions and 195 deletions
|
@ -217,8 +217,6 @@ impl PipelineNamespace {
|
|||
|
||||
thread_local!(pub static PIPELINE_NAMESPACE: Cell<Option<PipelineNamespace>> = Cell::new(None));
|
||||
|
||||
thread_local!(pub static PIPELINE_ID: Cell<Option<PipelineId>> = Cell::new(None));
|
||||
|
||||
#[derive(Clone, PartialEq, Eq, PartialOrd, Ord, Copy, Hash, Debug, Deserialize, Serialize, HeapSizeOf)]
|
||||
pub struct PipelineNamespaceId(pub u32);
|
||||
|
||||
|
@ -246,15 +244,6 @@ impl PipelineId {
|
|||
let PipelineIndex(index) = self.index;
|
||||
webrender_traits::PipelineId(namespace_id, index)
|
||||
}
|
||||
|
||||
pub fn install(id: PipelineId) {
|
||||
PIPELINE_ID.with(|tls| tls.set(Some(id)))
|
||||
}
|
||||
|
||||
pub fn installed() -> Option<PipelineId> {
|
||||
PIPELINE_ID.with(|tls| tls.get())
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
impl fmt::Display for PipelineId {
|
||||
|
@ -265,6 +254,8 @@ impl fmt::Display for PipelineId {
|
|||
}
|
||||
}
|
||||
|
||||
thread_local!(pub static TOP_LEVEL_FRAME_ID: Cell<Option<FrameId>> = Cell::new(None));
|
||||
|
||||
#[derive(Clone, PartialEq, Eq, PartialOrd, Ord, Copy, Hash, Debug, Deserialize, Serialize, HeapSizeOf)]
|
||||
pub struct FrameIndex(pub u32);
|
||||
|
||||
|
@ -283,6 +274,16 @@ impl FrameId {
|
|||
new_frame_id
|
||||
})
|
||||
}
|
||||
|
||||
/// Each script and layout thread should have the top-level frame id installed,
|
||||
/// since it is used by crash reporting.
|
||||
pub fn install(id: FrameId) {
|
||||
TOP_LEVEL_FRAME_ID.with(|tls| tls.set(Some(id)))
|
||||
}
|
||||
|
||||
pub fn installed() -> Option<FrameId> {
|
||||
TOP_LEVEL_FRAME_ID.with(|tls| tls.get())
|
||||
}
|
||||
}
|
||||
|
||||
impl fmt::Display for FrameId {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue