diff options
| -rw-r--r-- | components/compositing/constellation.rs | 1 | ||||
| -rw-r--r-- | components/devtools/actors/console.rs | 16 | ||||
| -rw-r--r-- | components/devtools_traits/lib.rs | 2 | ||||
| -rw-r--r-- | components/script/devtools.rs | 11 |
4 files changed, 13 insertions, 17 deletions
diff --git a/components/compositing/constellation.rs b/components/compositing/constellation.rs index 4b704ce783a..dedf6e07b5e 100644 --- a/components/compositing/constellation.rs +++ b/components/compositing/constellation.rs @@ -6,7 +6,6 @@ use pipeline::{Pipeline, CompositionPipeline}; use compositor_task::CompositorProxy; use compositor_task::Msg as CompositorMsg; -use devtools_traits; use devtools_traits::{DevtoolsControlChan, DevtoolsControlMsg}; use geom::rect::{Rect, TypedRect}; use geom::scale_factor::ScaleFactor; diff --git a/components/devtools/actors/console.rs b/components/devtools/actors/console.rs index 6b1123ea38a..ce099d574ec 100644 --- a/components/devtools/actors/console.rs +++ b/components/devtools/actors/console.rs @@ -9,8 +9,8 @@ use actor::{Actor, ActorRegistry}; use protocol::JsonPacketStream; -use devtools_traits::{NullValue, VoidValue, NumberValue, StringValue, BooleanValue}; -use devtools_traits::{ActorValue, DevtoolScriptControlMsg}; +use devtools_traits; +use devtools_traits::{DevtoolScriptControlMsg}; use msg::constellation_msg::PipelineId; use collections::BTreeMap; @@ -226,18 +226,18 @@ impl Actor for ConsoleActor { //TODO: extract conversion into protocol module or some other useful place let result = match try!(port.recv().map_err(|_| ())) { - VoidValue => { + devtools_traits::EvaluateJSReply::VoidValue => { let mut m = BTreeMap::new(); m.insert("type".to_string(), "undefined".to_string().to_json()); Json::Object(m) } - NullValue => { + devtools_traits::EvaluateJSReply::NullValue => { let mut m = BTreeMap::new(); m.insert("type".to_string(), "null".to_string().to_json()); Json::Object(m) } - BooleanValue(val) => val.to_json(), - NumberValue(val) => { + devtools_traits::EvaluateJSReply::BooleanValue(val) => val.to_json(), + devtools_traits::EvaluateJSReply::NumberValue(val) => { if val.is_nan() { let mut m = BTreeMap::new(); m.insert("type".to_string(), "NaN".to_string().to_json()); @@ -258,8 +258,8 @@ impl Actor for ConsoleActor { val.to_json() } } - StringValue(s) => s.to_json(), - ActorValue(s) => { + devtools_traits::EvaluateJSReply::StringValue(s) => s.to_json(), + devtools_traits::EvaluateJSReply::ActorValue(s) => { //TODO: make initial ActorValue message include these properties. let mut m = BTreeMap::new(); m.insert("type".to_string(), "object".to_string().to_json()); diff --git a/components/devtools_traits/lib.rs b/components/devtools_traits/lib.rs index 2197391f5fa..13815e8cf9e 100644 --- a/components/devtools_traits/lib.rs +++ b/components/devtools_traits/lib.rs @@ -20,8 +20,6 @@ extern crate "serialize" as rustc_serialize; extern crate url; extern crate util; -pub use self::EvaluateJSReply::*; - use rustc_serialize::{Decodable, Decoder}; use msg::constellation_msg::PipelineId; use util::str::DOMString; diff --git a/components/script/devtools.rs b/components/script/devtools.rs index e5683d4819a..5333b9a4cee 100644 --- a/components/script/devtools.rs +++ b/components/script/devtools.rs @@ -2,7 +2,6 @@ * 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 devtools_traits; use devtools_traits::{EvaluateJSReply, NodeInfo, Modification}; use dom::bindings::conversions::FromJSValConvertible; use dom::bindings::conversions::StringificationBehavior; @@ -31,16 +30,16 @@ pub fn handle_evaluate_js(page: &Rc<Page>, pipeline: PipelineId, eval: String, r let rval = window.r().evaluate_js_on_global_with_result(eval.as_slice()); reply.send(if rval.is_undefined() { - devtools_traits::VoidValue + EvaluateJSReply::VoidValue } else if rval.is_boolean() { - devtools_traits::BooleanValue(rval.to_boolean()) + EvaluateJSReply::BooleanValue(rval.to_boolean()) } else if rval.is_double() { - devtools_traits::NumberValue(FromJSValConvertible::from_jsval(cx, rval, ()).unwrap()) + EvaluateJSReply::NumberValue(FromJSValConvertible::from_jsval(cx, rval, ()).unwrap()) } else if rval.is_string() { //FIXME: use jsstring_to_str when jsval grows to_jsstring - devtools_traits::StringValue(FromJSValConvertible::from_jsval(cx, rval, StringificationBehavior::Default).unwrap()) + EvaluateJSReply::StringValue(FromJSValConvertible::from_jsval(cx, rval, StringificationBehavior::Default).unwrap()) } else if rval.is_null() { - devtools_traits::NullValue + EvaluateJSReply::NullValue } else { //FIXME: jsvals don't have an is_int32/is_number yet assert!(rval.is_object()); |