Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 06:00:15 +01:00
Code Issues Projects Releases Packages Wiki Activity

Setting a devtools timeline marker may fail, due to pipeline lookup failure.

Browse source
This commit is contained in:
Alan Jeffrey 2016-10-12 12:56:23 -05:00
parent f584003191
commit a6d83a38e5
5 changed files with 28 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

6
components/devtools/actors/timeline.rs
View file

@ -143,7 +143,7 @@ impl TimelineActor {
}
}
fn pull_timeline_data(&self, receiver: IpcReceiver<TimelineMarker>, mut emitter: Emitter) {
fn pull_timeline_data(&self, receiver: IpcReceiver<Option<TimelineMarker>>, mut emitter: Emitter) {
let is_recording = self.is_recording.clone();
if !*is_recording.lock().unwrap() {
@ -157,7 +157,7 @@ impl TimelineActor {
}
let mut markers = vec![];
while let Ok(marker) = receiver.try_recv() {
while let Ok(Some(marker)) = receiver.try_recv() {
markers.push(emitter.marker(marker));
}
emitter.send(markers);
@ -182,7 +182,7 @@ impl Actor for TimelineActor {
"start" => {
**self.is_recording.lock().as_mut().unwrap() = true;
let (tx, rx) = ipc::channel::<TimelineMarker>().unwrap();
let (tx, rx) = ipc::channel::<Option<TimelineMarker>>().unwrap();
self.script_sender.send(SetTimelineMarkers(self.pipeline,
self.marker_types.clone(),
tx)).unwrap();