aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/devtools.rs
diff options
context:
space:
mode:
authorAnthony Ramine <n.oxyde@gmail.com>2016-10-04 01:28:08 +0200
committerAnthony Ramine <n.oxyde@gmail.com>2016-10-06 21:35:50 +0200
commit5d8979237b4bd44ab336f1c54ce728a33218da38 (patch)
tree3c2cb4417c1597a088165bc4a9524a15f7a2bef1 /components/script/devtools.rs
parent9c04eb60bdcb31221d93f8d6b7ebcb3728836625 (diff)
downloadservo-5d8979237b4bd44ab336f1c54ce728a33218da38.tar.gz
servo-5d8979237b4bd44ab336f1c54ce728a33218da38.zip
Make devtools::handle_evaluate_js take a &GlobalScope
Diffstat (limited to 'components/script/devtools.rs')
-rw-r--r--components/script/devtools.rs5
1 files changed, 2 insertions, 3 deletions
diff --git a/components/script/devtools.rs b/components/script/devtools.rs
index d12e24f5152..dcaee91c843 100644
--- a/components/script/devtools.rs
+++ b/components/script/devtools.rs
@@ -13,7 +13,6 @@ use dom::bindings::codegen::Bindings::ElementBinding::ElementMethods;
use dom::bindings::codegen::Bindings::LocationBinding::LocationMethods;
use dom::bindings::codegen::Bindings::WindowBinding::WindowMethods;
use dom::bindings::conversions::{ConversionResult, FromJSValConvertible, jsstring_to_str};
-use dom::bindings::global::GlobalRef;
use dom::bindings::inheritance::Castable;
use dom::bindings::js::Root;
use dom::bindings::reflector::Reflectable;
@@ -34,14 +33,14 @@ use uuid::Uuid;
#[allow(unsafe_code)]
-pub fn handle_evaluate_js(global: &GlobalRef, eval: String, reply: IpcSender<EvaluateJSReply>) {
+pub fn handle_evaluate_js(global: &GlobalScope, eval: String, reply: IpcSender<EvaluateJSReply>) {
// global.get_cx() returns a valid `JSContext` pointer, so this is safe.
let result = unsafe {
let cx = global.get_cx();
let globalhandle = global.reflector().get_jsobject();
let _ac = JSAutoCompartment::new(cx, globalhandle.get());
rooted!(in(cx) let mut rval = UndefinedValue());
- global.as_global_scope().evaluate_js_on_global_with_result(&eval, rval.handle_mut());
+ global.evaluate_js_on_global_with_result(&eval, rval.handle_mut());
if rval.is_undefined() {
EvaluateJSReply::VoidValue