diff options
| author | bors-servo <metajack+bors@gmail.com> | 2015-08-07 14:41:37 -0600 |
|---|---|---|
| committer | bors-servo <metajack+bors@gmail.com> | 2015-08-07 14:41:37 -0600 |
| commit | a5c7508fabb36f9f5bc14e84b5f481cf7036e5f7 (patch) | |
| tree | ddefc8fc6763f64be3fdd868e8ea3c99b7d00950 /components/script/script_task.rs | |
| parent | 08987e3eda370e3eb00876c7f5efdebf3ba0265a (diff) | |
| parent | 8c3cf90e6e6b069ab38a5ac241df468e827e3cb7 (diff) | |
| download | servo-a5c7508fabb36f9f5bc14e84b5f481cf7036e5f7.tar.gz servo-a5c7508fabb36f9f5bc14e84b5f481cf7036e5f7.zip | |
Auto merge of #7009 - connorimes:remove-confusing-typedefs, r=Ms2ger
Remove typedefs DevtoolsControlChan and DevtoolsControlPort
<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/7009)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script/script_task.rs')
| -rw-r--r-- | components/script/script_task.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/components/script/script_task.rs b/components/script/script_task.rs index 17c38a2de87..efbad39dc86 100644 --- a/components/script/script_task.rs +++ b/components/script/script_task.rs @@ -53,7 +53,7 @@ use timers::TimerId; use devtools; use webdriver_handlers; -use devtools_traits::{DevtoolsControlPort, DevtoolsPageInfo, DevtoolScriptControlMsg}; +use devtools_traits::{DevtoolsPageInfo, DevtoolScriptControlMsg}; use devtools_traits::{ScriptToDevtoolsControlMsg, TimelineMarker, TimelineMarkerType}; use devtools_traits::{TracingMetadata}; use script_traits::CompositorEvent::{MouseDownEvent, MouseUpEvent}; @@ -336,7 +336,7 @@ pub struct ScriptTask { devtools_chan: Option<IpcSender<ScriptToDevtoolsControlMsg>>, /// For receiving commands from an optional devtools server. Will be ignored if /// no such server exists. - devtools_port: DevtoolsControlPort, + devtools_port: Receiver<DevtoolScriptControlMsg>, devtools_sender: IpcSender<DevtoolScriptControlMsg>, /// For sending timeline markers. Will be ignored if /// no devtools server |