mirror of
https://github.com/servo/servo.git
synced 2025-08-06 14:10:11 +01:00
Auto merge of #13728 - asajeffrey:devtools-set-timeline-marker-may-fail, r=fitzgen
Setting a devtools timeline marker may fail, due to pipeline lookup failure <!-- Please describe your changes on the following line: --> Allow setting a devtools timeline marker to fail, due to pipeline lookup failure. This is part of tidying up pipeline lookup. cc @jdm --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: --> - [X] `./mach build -d` does not report any errors - [X] `./mach test-tidy` does not report any errors - [X] These changes do not require tests because I'm not sure how to test devtools. <!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. --> <!-- 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/13728) <!-- Reviewable:end -->
This commit is contained in:
commit
bb75e2e727
5 changed files with 28 additions and 22 deletions
|
@ -172,7 +172,7 @@ pub struct Window {
|
|||
/// no devtools server
|
||||
devtools_markers: DOMRefCell<HashSet<TimelineMarkerType>>,
|
||||
#[ignore_heap_size_of = "channels are hard"]
|
||||
devtools_marker_sender: DOMRefCell<Option<IpcSender<TimelineMarker>>>,
|
||||
devtools_marker_sender: DOMRefCell<Option<IpcSender<Option<TimelineMarker>>>>,
|
||||
|
||||
/// Pending resize event, if any.
|
||||
resize_event: Cell<Option<(WindowSizeData, WindowSizeType)>>,
|
||||
|
@ -1435,12 +1435,12 @@ impl Window {
|
|||
pub fn emit_timeline_marker(&self, marker: TimelineMarker) {
|
||||
let sender = self.devtools_marker_sender.borrow();
|
||||
let sender = sender.as_ref().expect("There is no marker sender");
|
||||
sender.send(marker).unwrap();
|
||||
sender.send(Some(marker)).unwrap();
|
||||
}
|
||||
|
||||
pub fn set_devtools_timeline_markers(&self,
|
||||
markers: Vec<TimelineMarkerType>,
|
||||
reply: IpcSender<TimelineMarker>) {
|
||||
reply: IpcSender<Option<TimelineMarker>>) {
|
||||
*self.devtools_marker_sender.borrow_mut() = Some(reply);
|
||||
self.devtools_markers.borrow_mut().extend(markers.into_iter());
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue