mirror of
https://github.com/servo/servo.git
synced 2025-08-06 06:00:15 +01:00
Use mozjs exposed function to generate SourceText
This commit is contained in:
parent
5f71be281d
commit
018b23d43b
3 changed files with 9 additions and 30 deletions
|
@ -36,7 +36,8 @@ use crate::dom::workerglobalscope::WorkerGlobalScope;
|
|||
use crate::realms::{enter_realm, InRealm};
|
||||
use dom_struct::dom_struct;
|
||||
use fnv::FnvHasher;
|
||||
use js::jsapi::{JS_GetFunctionObject, SourceText};
|
||||
use js::jsapi::JS_GetFunctionObject;
|
||||
use js::rust::transform_u16_to_source_text;
|
||||
use js::rust::wrappers::CompileFunction;
|
||||
use js::rust::{CompileOptionsWrapper, RootedObjectVectorWrapper};
|
||||
use libc::c_char;
|
||||
|
@ -47,7 +48,6 @@ 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::rc::Rc;
|
||||
|
@ -539,12 +539,7 @@ impl EventTarget {
|
|||
name.as_ptr(),
|
||||
args.len() as u32,
|
||||
args.as_ptr(),
|
||||
&mut SourceText {
|
||||
units_: body.as_ptr() as *const _,
|
||||
length_: body.len() as u32,
|
||||
ownsUnits_: false,
|
||||
_phantom_0: PhantomData,
|
||||
},
|
||||
&mut transform_u16_to_source_text(&body),
|
||||
)
|
||||
});
|
||||
if handler.get().is_null() {
|
||||
|
|
|
@ -67,9 +67,10 @@ use ipc_channel::router::ROUTER;
|
|||
use js::glue::{IsWrapper, UnwrapObjectDynamic};
|
||||
use js::jsapi::{CurrentGlobalOrNull, GetNonCCWObjectGlobal};
|
||||
use js::jsapi::{HandleObject, Heap};
|
||||
use js::jsapi::{JSContext, JSObject, SourceText};
|
||||
use js::jsapi::{JSContext, JSObject};
|
||||
use js::jsval::{JSVal, UndefinedValue};
|
||||
use js::panic::maybe_resume_unwind;
|
||||
use js::rust::transform_str_to_source_text;
|
||||
use js::rust::wrappers::Evaluate2;
|
||||
use js::rust::{get_object_class, CompileOptionsWrapper, ParentRuntime, Runtime};
|
||||
use js::rust::{HandleValue, MutableHandleValue};
|
||||
|
@ -97,7 +98,6 @@ use std::cell::{Cell, RefCell, RefMut};
|
|||
use std::collections::hash_map::Entry;
|
||||
use std::collections::{HashMap, VecDeque};
|
||||
use std::ffi::CString;
|
||||
use std::marker::PhantomData;
|
||||
use std::mem;
|
||||
use std::ops::Index;
|
||||
use std::rc::Rc;
|
||||
|
@ -2166,12 +2166,7 @@ impl GlobalScope {
|
|||
Evaluate2(
|
||||
*cx,
|
||||
options.ptr,
|
||||
&mut SourceText {
|
||||
units_: code.as_ptr() as *const _,
|
||||
length_: code.len() as u32,
|
||||
ownsUnits_: false,
|
||||
_phantom_0: PhantomData,
|
||||
},
|
||||
&mut transform_str_to_source_text(code),
|
||||
rval,
|
||||
)
|
||||
};
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue