diff options
Diffstat (limited to 'components/script/dom')
| -rw-r--r-- | components/script/dom/bindings/codegen/CodegenRust.py | 18 | ||||
| -rw-r--r-- | components/script/dom/bindings/error.rs | 4 | ||||
| -rw-r--r-- | components/script/dom/domexception.rs | 2 | ||||
| -rw-r--r-- | components/script/dom/workerglobalscope.rs | 4 |
4 files changed, 14 insertions, 14 deletions
diff --git a/components/script/dom/bindings/codegen/CodegenRust.py b/components/script/dom/bindings/codegen/CodegenRust.py index 3ac47486fe0..ed2144a30ec 100644 --- a/components/script/dom/bindings/codegen/CodegenRust.py +++ b/components/script/dom/bindings/codegen/CodegenRust.py @@ -4645,7 +4645,7 @@ class CGBindingRoot(CGThing): 'dom::bindings::codegen::{PrototypeList, RegisterBindings, UnionTypes}', 'dom::bindings::codegen::Bindings::*', 'dom::bindings::error::{Fallible, Error, ErrorResult}', - 'dom::bindings::error::Error::FailureUnknown', + 'dom::bindings::error::Error::JSFailed', 'dom::bindings::error::throw_dom_exception', 'dom::bindings::error::throw_type_error', 'dom::bindings::proxyhandler', @@ -4814,14 +4814,14 @@ class CGCallback(CGClass): setupCall = ("let s = CallSetup::new(self, aExceptionHandling);\n" "if s.get_context().is_null() {\n" - " return Err(FailureUnknown);\n" + " return Err(JSFailed);\n" "}\n") bodyWithThis = string.Template( setupCall+ "let thisObjJS = wrap_call_this_object(s.get_context(), thisObj);\n" "if thisObjJS.is_null() {\n" - " return Err(FailureUnknown);\n" + " return Err(JSFailed);\n" "}\n" "return ${methodName}(${callArgs});").substitute({ "callArgs" : ", ".join(argnamesWithThis), @@ -4946,7 +4946,7 @@ class CallbackMember(CGNativeMember): jsObjectsArePtr=True) # We have to do all the generation of our body now, because # the caller relies on us throwing if we can't manage it. - self.exceptionCode= "return Err(FailureUnknown);" + self.exceptionCode = "return Err(JSFailed);" self.body = self.getImpl() def getImpl(self): @@ -5076,7 +5076,7 @@ class CallbackMember(CGNativeMember): "CallSetup s(CallbackPreserveColor(), aRv, aExceptionHandling);\n" "JSContext* cx = s.get_context();\n" "if (!cx) {\n" - " return Err(FailureUnknown);\n" + " return Err(JSFailed);\n" "}\n") def getArgcDecl(self): @@ -5121,7 +5121,7 @@ class CallbackMethod(CallbackMember): " ${argc}, ${argv}, &mut rval)\n" "};\n" "if ok == 0 {\n" - " return Err(FailureUnknown);\n" + " return Err(JSFailed);\n" "}\n").substitute(replacements) class CallCallback(CallbackMethod): @@ -5158,7 +5158,7 @@ class CallbackOperationBase(CallbackMethod): } getCallableFromProp = string.Template( 'match self.parent.get_callable_property(cx, "${methodName}") {\n' - ' Err(_) => return Err(FailureUnknown),\n' + ' Err(_) => return Err(JSFailed),\n' ' Ok(callable) => callable,\n' '}').substitute(replacements) if not self.singleOperation: @@ -5201,7 +5201,7 @@ class CallbackGetter(CallbackMember): } return string.Template( 'if (!JS_GetProperty(cx, mCallback, "${attrName}", &rval)) {\n' - ' return Err(FailureUnknown);\n' + ' return Err(JSFailed);\n' '}\n').substitute(replacements); class CallbackSetter(CallbackMember): @@ -5227,7 +5227,7 @@ class CallbackSetter(CallbackMember): return string.Template( 'MOZ_ASSERT(argv.length() == 1);\n' 'if (!JS_SetProperty(cx, mCallback, "${attrName}", ${argv})) {\n' - ' return Err(FailureUnknown);\n' + ' return Err(JSFailed);\n' '}\n').substitute(replacements) def getArgcDecl(self): diff --git a/components/script/dom/bindings/error.rs b/components/script/dom/bindings/error.rs index 806e3c21ffe..6188640ad6f 100644 --- a/components/script/dom/bindings/error.rs +++ b/components/script/dom/bindings/error.rs @@ -52,8 +52,8 @@ pub enum Error { DataClone, /// NoModificationAllowedError NoModificationAllowedError, - /// Unknown failure - FailureUnknown, + /// A JavaScript exception is already pending. + JSFailed, } /// The return type for IDL operations that can throw DOM exceptions. diff --git a/components/script/dom/domexception.rs b/components/script/dom/domexception.rs index 4509c0b5eaf..7987a324314 100644 --- a/components/script/dom/domexception.rs +++ b/components/script/dom/domexception.rs @@ -58,7 +58,7 @@ impl DOMErrorName { Error::Timeout => DOMErrorName::TimeoutError, Error::DataClone => DOMErrorName::DataCloneError, Error::NoModificationAllowedError => DOMErrorName::NoModificationAllowedError, - Error::FailureUnknown => panic!(), + Error::JSFailed => panic!(), } } } diff --git a/components/script/dom/workerglobalscope.rs b/components/script/dom/workerglobalscope.rs index 5b2ff2c971e..86d93db6ce0 100644 --- a/components/script/dom/workerglobalscope.rs +++ b/components/script/dom/workerglobalscope.rs @@ -6,7 +6,7 @@ use dom::bindings::codegen::Bindings::FunctionBinding::Function; use dom::bindings::codegen::Bindings::WorkerGlobalScopeBinding::WorkerGlobalScopeMethods; use dom::bindings::codegen::InheritTypes::DedicatedWorkerGlobalScopeCast; use dom::bindings::error::{ErrorResult, Fallible}; -use dom::bindings::error::Error::{Syntax, Network, FailureUnknown}; +use dom::bindings::error::Error::{Syntax, Network, JSFailed}; use dom::bindings::global::GlobalRef; use dom::bindings::js::{MutNullableJS, JSRef, Temporary}; use dom::bindings::utils::Reflectable; @@ -118,7 +118,7 @@ impl<'a> WorkerGlobalScopeMethods for JSRef<'a, WorkerGlobalScope> { Ok(_) => (), Err(_) => { println!("evaluate_script failed"); - return Err(FailureUnknown); + return Err(JSFailed); } } } |