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

Simplify devtools frame marker notification. Record each frame tick based on a single message sent from the script task that ticked.

Browse source
This commit is contained in:
Josh Matthews 2015-08-12 00:56:36 -04:00
parent 47b9e89c66
commit e59de75608
8 changed files with 33 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

71
components/devtools/actors/framerate.rs
View file

@ -22,7 +22,7 @@ pub struct FramerateActor {
script_sender: IpcSender<DevtoolScriptControlMsg>,
devtools_sender: Sender<DevtoolsControlMsg>,
start_time: Option<u64>,
is_recording: Arc<Mutex<bool>>,
is_recording: bool,
ticks: Arc<Mutex<Vec<HighResolutionStamp>>>,
}
@ -54,7 +54,7 @@ impl FramerateActor {
script_sender: script_sender,
devtools_sender: devtools_sender,
start_time: None,
is_recording: Arc::new(Mutex::new(false)),
is_recording: false,
ticks: Arc::new(Mutex::new(Vec::new())),
};
@ -67,6 +67,12 @@ impl FramerateActor {
let mut lock = self.ticks.lock();
let mut ticks = lock.as_mut().unwrap();
ticks.push(HighResolutionStamp::wrap(tick));
if self.is_recording {
let msg = DevtoolScriptControlMsg::RequestAnimationFrame(self.pipeline,
self.name());
self.script_sender.send(msg).unwrap();
}
}
pub fn take_pending_ticks(&self) -> Vec<HighResolutionStamp> {
@ -76,74 +82,23 @@ impl FramerateActor {
}
fn start_recording(&mut self) {
let mut lock = self.is_recording.lock();
if **lock.as_ref().unwrap() {
if self.is_recording {
return;
}
self.start_time = Some(precise_time_ns());
let is_recording = lock.as_mut();
**is_recording.unwrap() = true;
self.is_recording = true;
fn get_closure(is_recording: Arc<Mutex<bool>>,
name: String,
pipeline: PipelineId,
script_sender: IpcSender<DevtoolScriptControlMsg>,
devtools_sender: Sender<DevtoolsControlMsg>)
-> Box<Fn(f64, ) + Send> {
let closure = move |now: f64| {
let msg = DevtoolsControlMsg::FromChrome(ChromeToDevtoolsControlMsg::FramerateTick(
name.clone(), now));
devtools_sender.send(msg).unwrap();
if !*is_recording.lock().unwrap() {
return;
}
let closure = get_closure(is_recording.clone(),
name.clone(),
pipeline.clone(),
script_sender.clone(),
devtools_sender.clone());
let (request_animation_frame_sender, request_animation_frame_receiver) =
ipc::channel().unwrap();
ROUTER.add_route(request_animation_frame_receiver.to_opaque(), box move |message| {
let value: f64 = message.to().unwrap();
closure(value);
});
let msg = DevtoolScriptControlMsg::RequestAnimationFrame(
pipeline,
request_animation_frame_sender);
script_sender.send(msg).unwrap();
};
Box::new(closure)
};
let closure = get_closure(self.is_recording.clone(),
self.name(),
self.pipeline.clone(),
self.script_sender.clone(),
self.devtools_sender.clone());
let (request_animation_frame_sender, request_animation_frame_receiver) =
ipc::channel().unwrap();
ROUTER.add_route(request_animation_frame_receiver.to_opaque(), box move |message| {
let value: f64 = message.to().unwrap();
closure(value);
});
let msg = DevtoolScriptControlMsg::RequestAnimationFrame(self.pipeline,
request_animation_frame_sender);
self.name());
self.script_sender.send(msg).unwrap();
}
fn stop_recording(&mut self) {
let mut lock = self.is_recording.lock();
if !**lock.as_ref().unwrap() {
if !self.is_recording {
return;
}
let is_recording = lock.as_mut();
**is_recording.unwrap() = false;
self.is_recording = false;
self.start_time = None;
}