Auto merge of #6742 - chotchki:accept_int32, r=jdm

Added support for int32 to webdriver.

Fix for issue #6729

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/6742)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2015-07-25 07:50:26 -06:00
commit ee07e7110d

View file

@ -45,7 +45,7 @@ pub fn jsval_to_webdriver(cx: *mut JSContext, val: HandleValue) -> WebDriverJSRe
Ok(WebDriverJSValue::Undefined) Ok(WebDriverJSValue::Undefined)
} else if val.get().is_boolean() { } else if val.get().is_boolean() {
Ok(WebDriverJSValue::Boolean(val.get().to_boolean())) Ok(WebDriverJSValue::Boolean(val.get().to_boolean()))
} else if val.get().is_double() { } else if val.get().is_double() || val.get().is_int32() {
Ok(WebDriverJSValue::Number(FromJSValConvertible::from_jsval(cx, val, ()).unwrap())) Ok(WebDriverJSValue::Number(FromJSValConvertible::from_jsval(cx, val, ()).unwrap()))
} else if val.get().is_string() { } else if val.get().is_string() {
//FIXME: use jsstring_to_str when jsval grows to_jsstring //FIXME: use jsstring_to_str when jsval grows to_jsstring