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

Use external mutability for FramerateActor::ticks.

Browse source
This commit is contained in:
Ms2ger 2015-08-12 11:51:57 +02:00
parent a35360aa31
commit 2126301c2d
2 changed files with 8 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -6,7 +6,6 @@ use ipc_channel::ipc::IpcSender;
use rustc_serialize::json;
use std::mem;
use std::net::TcpStream;
use std::sync::{Arc, Mutex};
use time::precise_time_ns;
use msg::constellation_msg::PipelineId;
@ -20,7 +19,7 @@ pub struct FramerateActor {
script_sender: IpcSender<DevtoolScriptControlMsg>,
start_time: Option<u64>,
is_recording: bool,
ticks: Arc<Mutex<Vec<HighResolutionStamp>>>,
ticks: Vec<HighResolutionStamp>,
}
impl Actor for FramerateActor {
@ -50,7 +49,7 @@ impl FramerateActor {
script_sender: script_sender,
start_time: None,
is_recording: false,
ticks: Arc::new(Mutex::new(Vec::new())),
ticks: Vec::new(),
};
actor.start_recording();
@ -58,10 +57,8 @@ impl FramerateActor {
actor_name
}
pub fn add_tick(&self, tick: f64) {
let mut lock = self.ticks.lock();
let mut ticks = lock.as_mut().unwrap();
ticks.push(HighResolutionStamp::wrap(tick));
pub fn add_tick(&mut self, tick: f64) {
self.ticks.push(HighResolutionStamp::wrap(tick));
if self.is_recording {
let msg = DevtoolScriptControlMsg::RequestAnimationFrame(self.pipeline,
@ -70,10 +67,8 @@ impl FramerateActor {
}
}
pub fn take_pending_ticks(&self) -> Vec<HighResolutionStamp> {
let mut lock = self.ticks.lock();
let mut ticks = lock.as_mut().unwrap();
mem::replace(ticks, Vec::new())
pub fn take_pending_ticks(&mut self) -> Vec<HighResolutionStamp> {
mem::replace(&mut self.ticks, Vec::new())
}
fn start_recording(&mut self) {

4
components/devtools/lib.rs
View file

@ -185,8 +185,8 @@ fn run_server(sender: Sender<DevtoolsControlMsg>,
}
fn handle_framerate_tick(actors: Arc<Mutex<ActorRegistry>>, actor_name: String, tick: f64) {
let actors = actors.lock().unwrap();
let framerate_actor = actors.find::<FramerateActor>(&actor_name);
let mut actors = actors.lock().unwrap();
let framerate_actor = actors.find_mut::<FramerateActor>(&actor_name);
framerate_actor.add_tick(tick);
}