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

Do not glob-export DevtoolScriptControlMsg variants.

Browse source
This commit is contained in:
Ruud van Asseldonk 2015-02-13 13:35:31 +01:00
parent 1452614e28
commit 6ff3a5a3c1
5 changed files with 20 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

5
components/devtools/actors/console.rs
View file

@ -9,7 +9,7 @@
use actor::{Actor, ActorRegistry};
use protocol::JsonPacketStream;
use devtools_traits::{EvaluateJS, NullValue, VoidValue, NumberValue, StringValue, BooleanValue};
use devtools_traits::{NullValue, VoidValue, NumberValue, StringValue, BooleanValue};
use devtools_traits::{ActorValue, DevtoolScriptControlMsg};
use msg::constellation_msg::PipelineId;
@ -221,7 +221,8 @@ impl Actor for ConsoleActor {
"evaluateJS" => {
let input = msg.get(&"text".to_string()).unwrap().as_string().unwrap().to_string();
let (chan, port) = channel();
self.script_chan.send(EvaluateJS(self.pipeline, input.clone(), chan)).unwrap();
self.script_chan.send(DevtoolScriptControlMsg::EvaluateJS(
self.pipeline, input.clone(), chan)).unwrap();
//TODO: extract conversion into protocol module or some other useful place
let result = match try!(port.recv().map_err(|_| ())) {