Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 14:10:11 +01:00
Code Issues Projects Releases Packages Wiki Activity

Use mozjs exposed function to generate SourceText

Browse source
This commit is contained in:
CYBAI 2020-03-26 13:23:23 +09:00
parent 5f71be281d
commit 018b23d43b
3 changed files with 9 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

11
components/script/dom/globalscope.rs
View file

@ -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,
)
};