Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-20 07:08:59 +01:00
Code Issues Projects Releases Packages Wiki Activity

Report exceptions to JS when the DOM implementation fails.

Browse source 
As a bonus, adds some debugging statements.
This commit is contained in:
Ms2ger 2013-10-23 08:19:26 +02:00
parent c5db2ab516
commit 29a7405b4e
4 changed files with 24 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/components/script/dom/bindings/utils.rs
View file

@ -18,6 +18,7 @@ use std::unstable::raw::Box;
use js::glue::*;
use js::glue::{DefineFunctionWithReserved, GetObjectJSClass, RUST_OBJECT_TO_JSVAL};
use js::glue::{js_IsObjectProxyClass, js_IsFunctionProxyClass, IsProxyHandlerFamily};
use js::glue::{ReportError};
use js::jsapi::{JS_AlreadyHasOwnProperty, JS_NewObject, JS_NewFunction};
use js::jsapi::{JS_DefineProperties, JS_WrapValue, JS_ForwardGetPropertyTo};
use js::jsapi::{JS_GetClass, JS_LinkConstructorAndPrototype, JS_GetStringCharsAndLength};
@ -30,6 +31,7 @@ use js::jsapi::{JSContext, JSObject, JSBool, jsid, JSClass, JSNative, JSTracer};
use js::jsapi::{JSFunctionSpec, JSPropertySpec, JSVal, JSPropertyDescriptor};
use js::jsapi::{JSPropertyOp, JSStrictPropertyOp, JS_NewGlobalObject, JS_InitStandardClasses};
use js::jsapi::{JSString, JS_CallTracer, JSTRACE_OBJECT};
use js::jsapi::{JS_IsExceptionPending};
use js::jsfriendapi::bindgen::JS_NewObjectWithUniqueType;
use js::{JSPROP_ENUMERATE, JSVAL_NULL, JSCLASS_IS_GLOBAL, JSCLASS_IS_DOMJSCLASS};
use js::{JSPROP_PERMANENT, JSID_VOID, JSPROP_NATIVE_ACCESSORS, JSPROP_GETTER};
@ -251,6 +253,7 @@ pub fn jsval_to_str(cx: *JSContext, v: JSVal,
} else {
let jsstr = unsafe { JS_ValueToString(cx, v) };
if jsstr.is_null() {
debug!("JS_ValueToString failed");
Err(())
} else {
Ok(jsstring_to_str(cx, jsstr))
@ -265,6 +268,7 @@ pub fn jsval_to_domstring(cx: *JSContext, v: JSVal) -> Result<Option<DOMString>,
} else {
let jsstr = unsafe { JS_ValueToString(cx, v) };
if jsstr.is_null() {
debug!("JS_ValueToString failed");
Err(())
} else {
Ok(Some(jsstring_to_str(cx, jsstr)))
@ -917,6 +921,20 @@ pub fn cx_for_dom_object<T: Reflectable>(obj: &mut T) -> *JSContext {
cx_for_dom_reflector(obj.reflector().get_jsobject())
}
#[fixed_stack_segment]
pub fn throw_method_failed_with_details<T>(cx: *JSContext,
result: Result<T, Error>,
interface: &'static str,
member: &'static str) -> JSBool {
assert!(result.is_err());
assert!(unsafe { JS_IsExceptionPending(cx) } == 0);
let message = format!("Method failed: {}.{}", interface, member);
do message.with_c_str |string| {
unsafe { ReportError(cx, string) };
}
return 0;
}
/// Check if an element name is valid. See http://www.w3.org/TR/xml/#NT-Name
/// for details.
#[deriving(Eq)]