diff options
author | CYBAI <cyb.ai.815@gmail.com> | 2020-01-24 12:43:49 +0900 |
---|---|---|
committer | CYBAI <cyb.ai.815@gmail.com> | 2020-02-16 09:55:10 +0900 |
commit | 403ffcf1eb5c659626f70dec72f76aaf7782986d (patch) | |
tree | df2f2e06ed557fcaac17862791a6c1db1f8a7b57 /components/script/dom/eventtarget.rs | |
parent | 795dab71fffe98434308732e4cb8ee682f28e465 (diff) | |
download | servo-403ffcf1eb5c659626f70dec72f76aaf7782986d.tar.gz servo-403ffcf1eb5c659626f70dec72f76aaf7782986d.zip |
Always pass InRealm to GlobalScope::from_context to avoid getting null global
Diffstat (limited to 'components/script/dom/eventtarget.rs')
-rw-r--r-- | components/script/dom/eventtarget.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/components/script/dom/eventtarget.rs b/components/script/dom/eventtarget.rs index 91d24759697..4020f938b24 100644 --- a/components/script/dom/eventtarget.rs +++ b/components/script/dom/eventtarget.rs @@ -34,10 +34,10 @@ use crate::dom::node::document_from_node; use crate::dom::virtualmethods::VirtualMethods; use crate::dom::window::Window; use crate::dom::workerglobalscope::WorkerGlobalScope; -use crate::realms::enter_realm; +use crate::realms::{enter_realm, InRealm}; use dom_struct::dom_struct; use fnv::FnvHasher; -use js::jsapi::{JSAutoRealm, JSFunction, JS_GetFunctionObject, SourceText}; +use js::jsapi::{JSFunction, JS_GetFunctionObject, SourceText}; use js::rust::wrappers::CompileFunction; use js::rust::{AutoObjectVectorWrapper, CompileOptionsWrapper}; use libc::c_char; @@ -552,9 +552,9 @@ impl EventTarget { if !rv || handler.get().is_null() { // Step 3.7 unsafe { - let _ac = JSAutoRealm::new(*cx, self.reflector().get_jsobject().get()); + let ar = enter_realm(&*self); // FIXME(#13152): dispatch error event. - report_pending_exception(*cx, false); + report_pending_exception(*cx, false, InRealm::Entered(&ar)); } return None; } |