aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom/eventtarget.rs
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2019-05-10 23:51:12 -0400
committerGitHub <noreply@github.com>2019-05-10 23:51:12 -0400
commitd9559499b22bb4724f9b6108919f8d24bdbc83d9 (patch)
tree692e26002cd8afe36e8ab6679d929be11e58a0af /components/script/dom/eventtarget.rs
parent887f43b65bacad5490365f14d54bf25af4d3234b (diff)
parent7c1c1d9af4735ae86968d65d78b981b7c14585f3 (diff)
downloadservo-d9559499b22bb4724f9b6108919f8d24bdbc83d9.tar.gz
servo-d9559499b22bb4724f9b6108919f8d24bdbc83d9.zip
Auto merge of #23163 - jdm:smup66, r=asajeffrey
Upgrade to SpiderMonkey 66 <!-- Reviewable:start --> This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/23163) <!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom/eventtarget.rs')
-rw-r--r--components/script/dom/eventtarget.rs17
1 files changed, 11 insertions, 6 deletions
diff --git a/components/script/dom/eventtarget.rs b/components/script/dom/eventtarget.rs
index 69e536f73f9..b5376b88945 100644
--- a/components/script/dom/eventtarget.rs
+++ b/components/script/dom/eventtarget.rs
@@ -34,10 +34,10 @@ use crate::dom::virtualmethods::VirtualMethods;
use crate::dom::window::Window;
use dom_struct::dom_struct;
use fnv::FnvHasher;
-use js::jsapi::{JSAutoCompartment, JSFunction, JS_GetFunctionObject};
+use js::jsapi::{JSAutoRealm, JSFunction, JS_GetFunctionObject, SourceText};
use js::rust::wrappers::CompileFunction;
use js::rust::{AutoObjectVectorWrapper, CompileOptionsWrapper};
-use libc::{c_char, size_t};
+use libc::c_char;
use servo_atoms::Atom;
use servo_url::ServoUrl;
use std::collections::hash_map::Entry::{Occupied, Vacant};
@@ -45,6 +45,7 @@ use std::collections::HashMap;
use std::default::Default;
use std::ffi::CString;
use std::hash::BuildHasherDefault;
+use std::marker::PhantomData;
use std::mem;
use std::ops::{Deref, DerefMut};
use std::ptr;
@@ -505,7 +506,7 @@ impl EventTarget {
let scopechain = AutoObjectVectorWrapper::new(cx);
- let _ac = JSAutoCompartment::new(cx, window.reflector().get_jsobject().get());
+ let _ac = JSAutoRealm::new(cx, window.reflector().get_jsobject().get());
rooted!(in(cx) let mut handler = ptr::null_mut::<JSFunction>());
let rv = unsafe {
CompileFunction(
@@ -515,15 +516,19 @@ impl EventTarget {
name.as_ptr(),
args.len() as u32,
args.as_ptr(),
- body.as_ptr(),
- body.len() as size_t,
+ &mut SourceText {
+ units_: body.as_ptr() as *const _,
+ length_: body.len() as u32,
+ ownsUnits_: false,
+ _phantom_0: PhantomData,
+ },
handler.handle_mut().into(),
)
};
if !rv || handler.get().is_null() {
// Step 1.8.2
unsafe {
- let _ac = JSAutoCompartment::new(cx, self.reflector().get_jsobject().get());
+ let _ac = JSAutoRealm::new(cx, self.reflector().get_jsobject().get());
// FIXME(#13152): dispatch error event.
report_pending_exception(cx, false);
}