From 88cacfb0098e20be70c27bfde6b74cd3290f1fe4 Mon Sep 17 00:00:00 2001
From: marmeladema <xademax@gmail.com>
Date: Mon, 22 Jul 2019 22:14:11 +0100
Subject: Modify *::get_cx methods to return a safe JSContext instead of a raw
 one

---
 components/script/devtools.rs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'components/script/devtools.rs')

diff --git a/components/script/devtools.rs b/components/script/devtools.rs
index 5a0e1c9090c..7ae02dd3e1f 100644
--- a/components/script/devtools.rs
+++ b/components/script/devtools.rs
@@ -36,7 +36,7 @@ pub fn handle_evaluate_js(global: &GlobalScope, eval: String, reply: IpcSender<E
     let result = unsafe {
         let cx = global.get_cx();
         let _ac = enter_realm(global);
-        rooted!(in(cx) let mut rval = UndefinedValue());
+        rooted!(in(*cx) let mut rval = UndefinedValue());
         global.evaluate_js_on_global_with_result(&eval, rval.handle_mut());
 
         if rval.is_undefined() {
@@ -45,20 +45,20 @@ pub fn handle_evaluate_js(global: &GlobalScope, eval: String, reply: IpcSender<E
             EvaluateJSReply::BooleanValue(rval.to_boolean())
         } else if rval.is_double() || rval.is_int32() {
             EvaluateJSReply::NumberValue(
-                match FromJSValConvertible::from_jsval(cx, rval.handle(), ()) {
+                match FromJSValConvertible::from_jsval(*cx, rval.handle(), ()) {
                     Ok(ConversionResult::Success(v)) => v,
                     _ => unreachable!(),
                 },
             )
         } else if rval.is_string() {
-            EvaluateJSReply::StringValue(String::from(jsstring_to_str(cx, rval.to_string())))
+            EvaluateJSReply::StringValue(String::from(jsstring_to_str(*cx, rval.to_string())))
         } else if rval.is_null() {
             EvaluateJSReply::NullValue
         } else {
             assert!(rval.is_object());
 
-            rooted!(in(cx) let obj = rval.to_object());
-            let class_name = CStr::from_ptr(ObjectClassName(cx, obj.handle()));
+            rooted!(in(*cx) let obj = rval.to_object());
+            let class_name = CStr::from_ptr(ObjectClassName(*cx, obj.handle()));
             let class_name = str::from_utf8(class_name.to_bytes()).unwrap();
 
             EvaluateJSReply::ActorValue {
-- 
cgit v1.2.3