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

Import EvaluateJS variants directly.

Browse source
This commit is contained in:
Ruud van Asseldonk 2015-02-13 15:55:47 +01:00
parent 1748682092
commit 6c1d62f911
1 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -9,8 +9,9 @@
use actor::{Actor, ActorRegistry}; use actor::{Actor, ActorRegistry};
use protocol::JsonPacketStream; use protocol::JsonPacketStream;
use devtools_traits; use devtools_traits::EvaluateJSReply::{NullValue, VoidValue, NumberValue};
use devtools_traits::{DevtoolScriptControlMsg}; use devtools_traits::EvaluateJSReply::{StringValue, BooleanValue, ActorValue};
use devtools_traits::DevtoolScriptControlMsg;
use msg::constellation_msg::PipelineId; use msg::constellation_msg::PipelineId;
use collections::BTreeMap; use collections::BTreeMap;
@ -226,18 +227,18 @@ impl Actor for ConsoleActor {
//TODO: extract conversion into protocol module or some other useful place //TODO: extract conversion into protocol module or some other useful place
let result = match try!(port.recv().map_err(|_| ())) { let result = match try!(port.recv().map_err(|_| ())) {
devtools_traits::EvaluateJSReply::VoidValue => { VoidValue => {
let mut m = BTreeMap::new(); let mut m = BTreeMap::new();
m.insert("type".to_string(), "undefined".to_string().to_json()); m.insert("type".to_string(), "undefined".to_string().to_json());
Json::Object(m) Json::Object(m)
} }
devtools_traits::EvaluateJSReply::NullValue => { NullValue => {
let mut m = BTreeMap::new(); let mut m = BTreeMap::new();
m.insert("type".to_string(), "null".to_string().to_json()); m.insert("type".to_string(), "null".to_string().to_json());
Json::Object(m) Json::Object(m)
} }
devtools_traits::EvaluateJSReply::BooleanValue(val) => val.to_json(), BooleanValue(val) => val.to_json(),
devtools_traits::EvaluateJSReply::NumberValue(val) => { NumberValue(val) => {
if val.is_nan() { if val.is_nan() {
let mut m = BTreeMap::new(); let mut m = BTreeMap::new();
m.insert("type".to_string(), "NaN".to_string().to_json()); m.insert("type".to_string(), "NaN".to_string().to_json());
@ -258,8 +259,8 @@ impl Actor for ConsoleActor {
val.to_json() val.to_json()
} }
} }
devtools_traits::EvaluateJSReply::StringValue(s) => s.to_json(), StringValue(s) => s.to_json(),
devtools_traits::EvaluateJSReply::ActorValue(s) => { ActorValue(s) => {
//TODO: make initial ActorValue message include these properties. //TODO: make initial ActorValue message include these properties.
let mut m = BTreeMap::new(); let mut m = BTreeMap::new();
m.insert("type".to_string(), "object".to_string().to_json()); m.insert("type".to_string(), "object".to_string().to_json());