From 5662f0d34646c1e2940216b0a3317fd62a54aeb7 Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Fri, 26 Aug 2016 17:58:46 +0200 Subject: Remove the JSAutoCompartment from report_pending_exception. It doesn't really belong there. --- components/script/dom/bindings/callback.rs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'components/script/dom/bindings/callback.rs') diff --git a/components/script/dom/bindings/callback.rs b/components/script/dom/bindings/callback.rs index c34598a26be..c7a09fcc4d8 100644 --- a/components/script/dom/bindings/callback.rs +++ b/components/script/dom/bindings/callback.rs @@ -8,6 +8,7 @@ use dom::bindings::error::{Error, Fallible, report_pending_exception}; use dom::bindings::global::global_root_from_object; use dom::bindings::reflector::Reflectable; use js::jsapi::GetGlobalForObjectCrossCompartment; +use js::jsapi::JSAutoCompartment; use js::jsapi::JS_GetProperty; use js::jsapi::{Heap, MutableHandleObject, RootedObject}; use js::jsapi::{IsCallable, JSContext, JSObject, JS_WrapObject}; @@ -189,7 +190,8 @@ impl<'a> Drop for CallSetup<'a> { unsafe { JS_LeaveCompartment(self.cx, self.old_compartment); if self.handling == ExceptionHandling::Report { - report_pending_exception(self.cx, *self.exception_compartment); + let _ac = JSAutoCompartment::new(self.cx, *self.exception_compartment); + report_pending_exception(self.cx); } } } -- cgit v1.2.3