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

Remove typedefs DevtoolsControlChan and DevtoolsControlPort. Fixes #6923.

Browse source
This commit is contained in:
Connor Imes 2015-08-05 13:23:07 -05:00
parent 95269bba39
commit 8c3cf90e6e
4 changed files with 7 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

6
components/compositing/constellation.rs
View file

@ -16,7 +16,7 @@ use canvas::webgl_paint_task::WebGLPaintTask;
use canvas_traits::CanvasMsg; use canvas_traits::CanvasMsg;
use compositor_task::CompositorProxy; use compositor_task::CompositorProxy;
use compositor_task::Msg as CompositorMsg; use compositor_task::Msg as CompositorMsg;
use devtools_traits::{ChromeToDevtoolsControlMsg, DevtoolsControlChan, DevtoolsControlMsg}; use devtools_traits::{ChromeToDevtoolsControlMsg, DevtoolsControlMsg};
use euclid::point::Point2D; use euclid::point::Point2D;
use euclid::rect::{Rect, TypedRect}; use euclid::rect::{Rect, TypedRect};
use euclid::size::Size2D; use euclid::size::Size2D;
@ -81,7 +81,7 @@ pub struct Constellation<LTF, STF> {
pub image_cache_task: ImageCacheTask, pub image_cache_task: ImageCacheTask,
/// A channel through which messages can be sent to the developer tools. /// A channel through which messages can be sent to the developer tools.
devtools_chan: Option<DevtoolsControlChan>, devtools_chan: Option<Sender<DevtoolsControlMsg>>,
/// A channel through which messages can be sent to the storage task. /// A channel through which messages can be sent to the storage task.
storage_task: StorageTask, storage_task: StorageTask,
@ -225,7 +225,7 @@ impl<LTF: LayoutTaskFactory, STF: ScriptTaskFactory> Constellation<LTF, STF> {
font_cache_task: FontCacheTask, font_cache_task: FontCacheTask,
time_profiler_chan: time::ProfilerChan, time_profiler_chan: time::ProfilerChan,
mem_profiler_chan: mem::ProfilerChan, mem_profiler_chan: mem::ProfilerChan,
devtools_chan: Option<DevtoolsControlChan>, devtools_chan: Option<Sender<DevtoolsControlMsg>>,
storage_task: StorageTask, storage_task: StorageTask,
supports_clipboard: bool) supports_clipboard: bool)
-> ConstellationChan { -> ConstellationChan {

4
components/compositing/pipeline.rs
View file

@ -8,7 +8,7 @@ use script_traits::{LayoutControlMsg, ScriptControlChan, ScriptTaskFactory};
use script_traits::{NewLayoutInfo, ConstellationControlMsg}; use script_traits::{NewLayoutInfo, ConstellationControlMsg};
use compositor_task; use compositor_task;
use devtools_traits::{DevtoolsControlChan, DevtoolsControlMsg, ScriptToDevtoolsControlMsg}; use devtools_traits::{DevtoolsControlMsg, ScriptToDevtoolsControlMsg};
use euclid::rect::{TypedRect}; use euclid::rect::{TypedRect};
use euclid::scale_factor::ScaleFactor; use euclid::scale_factor::ScaleFactor;
use gfx::paint_task::{ChromeToPaintMsg, LayoutToPaintMsg, PaintTask}; use gfx::paint_task::{ChromeToPaintMsg, LayoutToPaintMsg, PaintTask};
@ -72,7 +72,7 @@ impl Pipeline {
parent_info: Option<(PipelineId, SubpageId)>, parent_info: Option<(PipelineId, SubpageId)>,
constellation_chan: ConstellationChan, constellation_chan: ConstellationChan,
compositor_proxy: Box<CompositorProxy+'static+Send>, compositor_proxy: Box<CompositorProxy+'static+Send>,
devtools_chan: Option<DevtoolsControlChan>, devtools_chan: Option<Sender<DevtoolsControlMsg>>,
image_cache_task: ImageCacheTask, image_cache_task: ImageCacheTask,
font_cache_task: FontCacheTask, font_cache_task: FontCacheTask,
resource_task: ResourceTask, resource_task: ResourceTask,

3
components/devtools_traits/lib.rs
View file

@ -39,9 +39,6 @@ use time::Duration;
use std::net::TcpStream; use std::net::TcpStream;
use std::sync::mpsc::{Receiver, Sender}; use std::sync::mpsc::{Receiver, Sender};
pub type DevtoolsControlChan = Sender<DevtoolsControlMsg>;
pub type DevtoolsControlPort = Receiver<DevtoolScriptControlMsg>;
// Information would be attached to NewGlobal to be received and show in devtools. // Information would be attached to NewGlobal to be received and show in devtools.
// Extend these fields if we need more information. // Extend these fields if we need more information.
#[derive(Deserialize, Serialize)] #[derive(Deserialize, Serialize)]

4
components/script/script_task.rs
View file

@ -53,7 +53,7 @@ use timers::TimerId;
use devtools; use devtools;
use webdriver_handlers; use webdriver_handlers;
use devtools_traits::{DevtoolsControlPort, DevtoolsPageInfo, DevtoolScriptControlMsg}; use devtools_traits::{DevtoolsPageInfo, DevtoolScriptControlMsg};
use devtools_traits::{ScriptToDevtoolsControlMsg, TimelineMarker, TimelineMarkerType}; use devtools_traits::{ScriptToDevtoolsControlMsg, TimelineMarker, TimelineMarkerType};
use devtools_traits::{TracingMetadata}; use devtools_traits::{TracingMetadata};
use script_traits::CompositorEvent::{MouseDownEvent, MouseUpEvent}; use script_traits::CompositorEvent::{MouseDownEvent, MouseUpEvent};
@ -327,7 +327,7 @@ pub struct ScriptTask {
devtools_chan: Option<IpcSender<ScriptToDevtoolsControlMsg>>, devtools_chan: Option<IpcSender<ScriptToDevtoolsControlMsg>>,
/// For receiving commands from an optional devtools server. Will be ignored if /// For receiving commands from an optional devtools server. Will be ignored if
/// no such server exists. /// no such server exists.
devtools_port: DevtoolsControlPort, devtools_port: Receiver<DevtoolScriptControlMsg>,
devtools_sender: IpcSender<DevtoolScriptControlMsg>, devtools_sender: IpcSender<DevtoolScriptControlMsg>,
/// For sending timeline markers. Will be ignored if /// For sending timeline markers. Will be ignored if
/// no devtools server /// no devtools server