From 3b4ebd7cd0fc6905d5135b2a393958c621d41899 Mon Sep 17 00:00:00 2001
From: Jerry Shih <bignose1007@gmail.com>
Date: Thu, 4 Dec 2014 23:06:27 -0800
Subject: [PATCH] handle null for evaluating JS value. #4235

---
 components/script/devtools.rs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/components/script/devtools.rs b/components/script/devtools.rs
index 8d7a5d35bad..a829a68293f 100644
--- a/components/script/devtools.rs
+++ b/components/script/devtools.rs
@@ -37,9 +37,11 @@ pub fn handle_evaluate_js(page: &Rc<Page>, pipeline: PipelineId, eval: String, r
     } else if rval.is_string() {
         //FIXME: use jsstring_to_str when jsval grows to_jsstring
         devtools_traits::StringValue(FromJSValConvertible::from_jsval(cx, rval, conversions::Default).unwrap())
+    } else if rval.is_null() {
+        devtools_traits::NullValue
     } else {
         //FIXME: jsvals don't have an is_int32/is_number yet
-        assert!(rval.is_object_or_null());
+        assert!(rval.is_object());
         panic!("object values unimplemented")
     });
 }