auto merge of #4397 : jdm/servo/issue_4235, r=jdm

Rebased from #4241.
This commit is contained in:
bors-servo 2014-12-16 16:03:45 -07:00
commit 03666f3105

View file

@ -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")
});
}