diff options
| author | Sam Gibson <sam@ifdown.net> | 2015-07-24 19:52:19 +1000 |
|---|---|---|
| committer | Sam Gibson <sam@ifdown.net> | 2015-07-24 19:52:19 +1000 |
| commit | 17e6b082654453aa5c0dbd3b6f7777d8ed8e7009 (patch) | |
| tree | 0a6f062a5c660ddc646ba71cadb41f8b387aa2fe /components/script/devtools.rs | |
| parent | 3c88d3418c5384e0e75c91ca2b3d8960c78af45f (diff) | |
| download | servo-17e6b082654453aa5c0dbd3b6f7777d8ed8e7009.tar.gz servo-17e6b082654453aa5c0dbd3b6f7777d8ed8e7009.zip | |
Eval'ing int32's in devtools panic'd
Diffstat (limited to 'components/script/devtools.rs')
| -rw-r--r-- | components/script/devtools.rs | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/components/script/devtools.rs b/components/script/devtools.rs index f80dfddaa98..f60eb2d4488 100644 --- a/components/script/devtools.rs +++ b/components/script/devtools.rs @@ -25,7 +25,12 @@ use std::sync::mpsc::Sender; use std::rc::Rc; -pub fn handle_evaluate_js(page: &Rc<Page>, pipeline: PipelineId, eval: String, reply: Sender<EvaluateJSReply>){ +pub fn handle_evaluate_js( + page: &Rc<Page>, + pipeline: PipelineId, + eval: String, + reply: Sender<EvaluateJSReply> + ) { let page = get_page(&*page, pipeline); let window = page.window(); let cx = window.r().get_cx(); @@ -36,8 +41,10 @@ pub fn handle_evaluate_js(page: &Rc<Page>, pipeline: PipelineId, eval: String, r EvaluateJSReply::VoidValue } else if rval.ptr.is_boolean() { EvaluateJSReply::BooleanValue(rval.ptr.to_boolean()) - } else if rval.ptr.is_double() { - EvaluateJSReply::NumberValue(FromJSValConvertible::from_jsval(cx, rval.handle(), ()).unwrap()) + } else if rval.ptr.is_double() || rval.ptr.is_int32() { + EvaluateJSReply::NumberValue( + FromJSValConvertible::from_jsval(cx, rval.handle(), ()).unwrap() + ) } else if rval.ptr.is_string() { //FIXME: use jsstring_to_str when jsval grows to_jsstring EvaluateJSReply::StringValue( |