From 17e6b082654453aa5c0dbd3b6f7777d8ed8e7009 Mon Sep 17 00:00:00 2001 From: Sam Gibson Date: Fri, 24 Jul 2015 19:52:19 +1000 Subject: [PATCH] Eval'ing int32's in devtools panic'd --- components/script/devtools.rs | 13 ++++++++++--- 1 file 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, pipeline: PipelineId, eval: String, reply: Sender){ +pub fn handle_evaluate_js( + page: &Rc, + pipeline: PipelineId, + eval: String, + reply: Sender + ) { 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, 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(