Enter a compartment when calling timeout handlers.

1 files changed, 9 insertions, 6 deletions

diff --git a/src/components/script/script_task.rs b/src/components/script/script_task.rs
index 724d5e194c7..20b0e8d33cc 100644
--- a/src/components/script/script_task.rs
+++ b/src/components/script/script_task.rs
@@ -787,12 +787,15 @@ impl ScriptTask {
             None => return,
             Some(timer_handle) => {
                 // TODO: Support extra arguments. This requires passing a `*JSVal` array as `argv`.
-                let rval = NullValue();
-                unsafe {
-                    JS_CallFunctionValue(self.get_cx(), this_value,
-                                         *timer_handle.data.funval,
-                                         0, ptr::null(), &rval);
-                }
+                let cx = self.get_cx();
+                with_compartment(cx, this_value, || {
+                    let rval = NullValue();
+                    unsafe {
+                        JS_CallFunctionValue(cx, this_value,
+                                             *timer_handle.data.funval,
+                                             0, ptr::null(), &rval);
+                    }
+                });
 
                 is_interval = timer_handle.data.is_interval;
             }