mirror of
https://github.com/servo/servo.git
synced 2025-08-03 04:30:10 +01:00
Auto merge of #7132 - jdm:docenum, r=ms2ger
Document the use and meaning of the devtools control messages. Fixes … …#6922. <!-- Reviewable:start --> [<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/7132) <!-- Reviewable:end -->
This commit is contained in:
bors-servo
commit
f3b7c5cb4b
10 changed files with 80 additions and 96 deletions
|
|
@ -2,27 +2,24 @@
|
|||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
use ipc_channel::ipc::{self, IpcSender};
|
||||
use ipc_channel::router::ROUTER;
|
||||
use ipc_channel::ipc::IpcSender;
|
||||
use rustc_serialize::json;
|
||||
use std::mem;
|
||||
use std::net::TcpStream;
|
||||
use std::sync::{Arc, Mutex};
|
||||
use std::sync::mpsc::Sender;
|
||||
use time::precise_time_ns;
|
||||
|
||||
use msg::constellation_msg::PipelineId;
|
||||
use actor::{Actor, ActorRegistry};
|
||||
use actors::timeline::HighResolutionStamp;
|
||||
use devtools_traits::{ChromeToDevtoolsControlMsg, DevtoolsControlMsg, DevtoolScriptControlMsg};
|
||||
use devtools_traits::DevtoolScriptControlMsg;
|
||||
|
||||
pub struct FramerateActor {
|
||||
name: String,
|
||||
pipeline: PipelineId,
|
||||
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>>>,
|
||||
}
|
||||
|
||||
|
|
@ -45,16 +42,14 @@ impl FramerateActor {
|
|||
/// return name of actor
|
||||
pub fn create(registry: &ActorRegistry,
|
||||
pipeline_id: PipelineId,
|
||||
script_sender: IpcSender<DevtoolScriptControlMsg>,
|
||||
devtools_sender: Sender<DevtoolsControlMsg>) -> String {
|
||||
script_sender: IpcSender<DevtoolScriptControlMsg>) -> String {
|
||||
let actor_name = registry.new_name("framerate");
|
||||
let mut actor = FramerateActor {
|
||||
name: actor_name.clone(),
|
||||
pipeline: pipeline_id,
|
||||
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 +62,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 +77,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;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
//! Liberally derived from the [Firefox JS implementation]
|
||||
//! (http://mxr.mozilla.org/mozilla-central/source/toolkit/devtools/server/actors/inspector.js).
|
||||
|
||||
use devtools_traits::{DevtoolScriptControlMsg, NodeInfo};
|
||||
use devtools_traits::{DevtoolScriptControlMsg, NodeInfo, ComputedNodeLayout};
|
||||
use devtools_traits::DevtoolScriptControlMsg::{GetRootNode, GetDocumentElement, GetChildren};
|
||||
use devtools_traits::DevtoolScriptControlMsg::{GetLayout, ModifyAttribute};
|
||||
|
||||
|
|
@ -458,7 +458,7 @@ impl Actor for PageStyleActor {
|
|||
registry.actor_to_script(target.to_string()),
|
||||
tx))
|
||||
.unwrap();
|
||||
let (width, height) = rx.recv().unwrap();
|
||||
let ComputedNodeLayout { width, height } = rx.recv().unwrap();
|
||||
|
||||
let auto_margins = msg.get(&"autoMargins".to_string())
|
||||
.and_then(&Json::as_boolean).unwrap_or(false);
|
||||
|
|
|
|||
|
|
@ -11,12 +11,12 @@ use std::mem;
|
|||
use std::net::TcpStream;
|
||||
use std::thread::sleep_ms;
|
||||
use std::sync::{Arc, Mutex};
|
||||
use std::sync::mpsc::{channel, Sender};
|
||||
use std::sync::mpsc::channel;
|
||||
|
||||
use actor::{Actor, ActorRegistry};
|
||||
use actors::memory::{MemoryActor, TimelineMemoryReply};
|
||||
use actors::framerate::FramerateActor;
|
||||
use devtools_traits::{DevtoolsControlMsg, DevtoolScriptControlMsg};
|
||||
use devtools_traits::DevtoolScriptControlMsg;
|
||||
use devtools_traits::DevtoolScriptControlMsg::{SetTimelineMarkers, DropTimelineMarkers};
|
||||
use devtools_traits::{PreciseTime, TimelineMarker, TracingMetadata, TimelineMarkerType};
|
||||
use protocol::JsonPacketStream;
|
||||
|
|
@ -25,7 +25,6 @@ use util::task;
|
|||
pub struct TimelineActor {
|
||||
name: String,
|
||||
script_sender: IpcSender<DevtoolScriptControlMsg>,
|
||||
devtools_sender: Sender<DevtoolsControlMsg>,
|
||||
marker_types: Vec<TimelineMarkerType>,
|
||||
pipeline: PipelineId,
|
||||
is_recording: Arc<Mutex<bool>>,
|
||||
|
|
@ -126,8 +125,7 @@ static DEFAULT_TIMELINE_DATA_PULL_TIMEOUT: u32 = 200; //ms
|
|||
impl TimelineActor {
|
||||
pub fn new(name: String,
|
||||
pipeline: PipelineId,
|
||||
script_sender: IpcSender<DevtoolScriptControlMsg>,
|
||||
devtools_sender: Sender<DevtoolsControlMsg>) -> TimelineActor {
|
||||
script_sender: IpcSender<DevtoolScriptControlMsg>) -> TimelineActor {
|
||||
|
||||
let marker_types = vec!(TimelineMarkerType::Reflow,
|
||||
TimelineMarkerType::DOMEvent);
|
||||
|
|
@ -137,7 +135,6 @@ impl TimelineActor {
|
|||
pipeline: pipeline,
|
||||
marker_types: marker_types,
|
||||
script_sender: script_sender,
|
||||
devtools_sender: devtools_sender,
|
||||
is_recording: Arc::new(Mutex::new(false)),
|
||||
stream: RefCell::new(None),
|
||||
|
||||
|
|
@ -260,8 +257,7 @@ impl Actor for TimelineActor {
|
|||
let framerate_actor = Some(FramerateActor::create(
|
||||
registry,
|
||||
self.pipeline.clone(),
|
||||
self.script_sender.clone(),
|
||||
self.devtools_sender.clone()));
|
||||
self.script_sender.clone()));
|
||||
*self.framerate_actor.borrow_mut() = framerate_actor;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -194,7 +194,6 @@ fn run_server(sender: Sender<DevtoolsControlMsg>,
|
|||
fn handle_new_global(actors: Arc<Mutex<ActorRegistry>>,
|
||||
ids: (PipelineId, Option<WorkerId>),
|
||||
script_sender: IpcSender<DevtoolScriptControlMsg>,
|
||||
devtools_sender: Sender<DevtoolsControlMsg>,
|
||||
actor_pipelines: &mut HashMap<PipelineId, String>,
|
||||
actor_workers: &mut HashMap<(PipelineId, WorkerId), String>,
|
||||
page_info: DevtoolsPageInfo) {
|
||||
|
|
@ -221,8 +220,7 @@ fn run_server(sender: Sender<DevtoolsControlMsg>,
|
|||
|
||||
let timeline = TimelineActor::new(actors.new_name("timeline"),
|
||||
pipeline,
|
||||
script_sender,
|
||||
devtools_sender);
|
||||
script_sender);
|
||||
|
||||
let DevtoolsPageInfo { title, url } = page_info;
|
||||
let tab = TabActor {
|
||||
|
|
@ -407,12 +405,12 @@ fn run_server(sender: Sender<DevtoolsControlMsg>,
|
|||
handle_client(actors, stream.try_clone().unwrap())
|
||||
})
|
||||
}
|
||||
Ok(DevtoolsControlMsg::FromChrome(ChromeToDevtoolsControlMsg::FramerateTick(
|
||||
Ok(DevtoolsControlMsg::FromScript(ScriptToDevtoolsControlMsg::FramerateTick(
|
||||
actor_name, tick))) =>
|
||||
handle_framerate_tick(actors.clone(), actor_name, tick),
|
||||
Ok(DevtoolsControlMsg::FromScript(ScriptToDevtoolsControlMsg::NewGlobal(
|
||||
ids, script_sender, pageinfo))) =>
|
||||
handle_new_global(actors.clone(), ids, script_sender, sender.clone(), &mut actor_pipelines,
|
||||
handle_new_global(actors.clone(), ids, script_sender, &mut actor_pipelines,
|
||||
&mut actor_workers, pageinfo),
|
||||
Ok(DevtoolsControlMsg::FromScript(ScriptToDevtoolsControlMsg::ConsoleAPI(
|
||||
id,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue