aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom/globalscope.rs
diff options
context:
space:
mode:
authorMarcin Mielniczuk <marmistrz.dev@zoho.eu>2018-03-28 21:28:30 +0200
committerMarcin Mielniczuk <marmistrz.dev@zoho.eu>2018-03-28 21:28:30 +0200
commit356c57e628255ed338b32246ce5e7de75da621f0 (patch)
treee6b98e284bf4cabce6c0dfce8b593dc9c2f8a534 /components/script/dom/globalscope.rs
parente04d517bff695c03df7f0417a494c8286860bc3c (diff)
downloadservo-356c57e628255ed338b32246ce5e7de75da621f0.tar.gz
servo-356c57e628255ed338b32246ce5e7de75da621f0.zip
Adapt Servo for mozjs 0.6 and the changes introduced in servo/rust-mozjs#393
Diffstat (limited to 'components/script/dom/globalscope.rs')
-rw-r--r--components/script/dom/globalscope.rs6
1 files changed, 4 insertions, 2 deletions
diff --git a/components/script/dom/globalscope.rs b/components/script/dom/globalscope.rs
index e3a1db7a1a7..29c06ce7a17 100644
--- a/components/script/dom/globalscope.rs
+++ b/components/script/dom/globalscope.rs
@@ -27,11 +27,13 @@ use ipc_channel::ipc::IpcSender;
use js::{JSCLASS_IS_DOMJSCLASS, JSCLASS_IS_GLOBAL};
use js::glue::{IsWrapper, UnwrapObject};
use js::jsapi::{CurrentGlobalOrNull, GetGlobalForObjectCrossCompartment};
-use js::jsapi::{HandleValue, Evaluate2, JSAutoCompartment, JSContext};
+use js::jsapi::{JSAutoCompartment, JSContext};
use js::jsapi::{JSObject, JS_GetContext};
-use js::jsapi::{JS_GetObjectRuntime, MutableHandleValue};
+use js::jsapi::JS_GetObjectRuntime;
use js::panic::maybe_resume_unwind;
use js::rust::{CompileOptionsWrapper, Runtime, get_object_class};
+use js::rust::{HandleValue, MutableHandleValue};
+use js::rust::wrappers::Evaluate2;
use libc;
use microtask::{Microtask, MicrotaskQueue};
use msg::constellation_msg::PipelineId;