Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-22 23:03:42 +01:00
Code Issues Projects Releases Packages Wiki Activity

Callbacks now uses safe JSContext instead of raw JSContext

Browse source
This commit is contained in:
marmeladema 2019-07-21 16:05:04 +01:00
parent 6e4caf1153
commit 2fb3f1f983
5 changed files with 27 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

18
components/script/dom/eventtarget.rs
View file

@ -33,6 +33,7 @@ use crate::dom::globalscope::GlobalScope;
use crate::dom::node::document_from_node;
use crate::dom::virtualmethods::VirtualMethods;
use crate::dom::window::Window;
use crate::script_runtime::JSContext;
use dom_struct::dom_struct;
use fnv::FnvHasher;
use js::jsapi::{JSAutoRealm, JSFunction, JS_GetFunctionObject, SourceText};
@ -543,16 +544,16 @@ impl EventTarget {
// Step 1.14
if is_error {
Some(CommonEventHandler::ErrorEventHandler(unsafe {
OnErrorEventHandlerNonNull::new(cx, funobj)
OnErrorEventHandlerNonNull::new(JSContext::from_ptr(cx), funobj)
}))
} else {
if ty == &atom!("beforeunload") {
Some(CommonEventHandler::BeforeUnloadEventHandler(unsafe {
OnBeforeUnloadEventHandlerNonNull::new(cx, funobj)
OnBeforeUnloadEventHandlerNonNull::new(JSContext::from_ptr(cx), funobj)
}))
} else {
Some(CommonEventHandler::EventHandler(unsafe {
EventHandlerNonNull::new(cx, funobj)
EventHandlerNonNull::new(JSContext::from_ptr(cx), funobj)
}))
}
}
@ -567,7 +568,7 @@ impl EventTarget {
let event_listener = listener.map(|listener| {
InlineEventListener::Compiled(CommonEventHandler::EventHandler(unsafe {
EventHandlerNonNull::new(cx, listener.callback())
EventHandlerNonNull::new(JSContext::from_ptr(cx), listener.callback())
}))
});
self.set_inline_event_listener(Atom::from(ty), event_listener);
@ -582,7 +583,7 @@ impl EventTarget {
let event_listener = listener.map(|listener| {
InlineEventListener::Compiled(CommonEventHandler::ErrorEventHandler(unsafe {
OnErrorEventHandlerNonNull::new(cx, listener.callback())
OnErrorEventHandlerNonNull::new(JSContext::from_ptr(cx), listener.callback())
}))
});
self.set_inline_event_listener(Atom::from(ty), event_listener);
@ -600,7 +601,7 @@ impl EventTarget {
let event_listener = listener.map(|listener| {
InlineEventListener::Compiled(CommonEventHandler::BeforeUnloadEventHandler(unsafe {
OnBeforeUnloadEventHandlerNonNull::new(cx, listener.callback())
OnBeforeUnloadEventHandlerNonNull::new(JSContext::from_ptr(cx), listener.callback())
}))
});
self.set_inline_event_listener(Atom::from(ty), event_listener);
@ -612,7 +613,10 @@ impl EventTarget {
let listener = self.get_inline_event_listener(&Atom::from(ty));
unsafe {
listener.map(|listener| {
CallbackContainer::new(cx, listener.parent().callback_holder().get())
CallbackContainer::new(
JSContext::from_ptr(cx),
listener.parent().callback_holder().get(),
)
})
}
}