Warning police.

components/devtools/actors/framerate.rs

@@ -2,25 +2,22 @@
  * 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::ipc::IpcSender;
-use ipc_channel::router::ROUTER;
 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: bool,
     ticks: Arc<Mutex<Vec<HighResolutionStamp>>>,
@@ -45,14 +42,12 @@ impl FramerateActor {
     /// return name of actor
     pub fn create(registry: &ActorRegistry,
                   pipeline_id: PipelineId,
-                  script_sender: IpcSender<DevtoolScriptControlMsg>,
+                  script_sender: IpcSender<DevtoolScriptControlMsg>) -> String {
-                  devtools_sender: Sender<DevtoolsControlMsg>) -> 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: false,
             ticks: Arc::new(Mutex::new(Vec::new())),

components/devtools/actors/timeline.rs

@@ -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>,
+               script_sender: IpcSender<DevtoolScriptControlMsg>) -> TimelineActor {
-               devtools_sender: Sender<DevtoolsControlMsg>) -> 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.script_sender.clone()));
-                                self.devtools_sender.clone()));
                         *self.framerate_actor.borrow_mut() = framerate_actor;
                     }
                 }

components/devtools/lib.rs

@@ -193,7 +193,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) {
@@ -220,8 +219,7 @@ fn run_server(sender: Sender<DevtoolsControlMsg>,
 
             let timeline = TimelineActor::new(actors.new_name("timeline"),
                                               pipeline,
-                                              script_sender,
+                                              script_sender);
-                                              devtools_sender);
 
             let DevtoolsPageInfo { title, url } = page_info;
             let tab = TabActor {
@@ -411,7 +409,7 @@ fn run_server(sender: Sender<DevtoolsControlMsg>,
                 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,