Merge branch 'master' into tojson

1 files changed, 3 insertions, 4 deletions

diff --git a/components/script/dom/offscreencanvas.rs b/components/script/dom/offscreencanvas.rs
index 2087c47c91f..142379519fb 100644
--- a/components/script/dom/offscreencanvas.rs
+++ b/components/script/dom/offscreencanvas.rs
@@ -15,9 +15,9 @@ use crate::dom::eventtarget::EventTarget;
 use crate::dom::globalscope::GlobalScope;
 use crate::dom::htmlcanvaselement::HTMLCanvasElement;
 use crate::dom::offscreencanvasrenderingcontext2d::OffscreenCanvasRenderingContext2D;
+use crate::script_runtime::JSContext;
 use dom_struct::dom_struct;
 use euclid::default::Size2D;
-use js::jsapi::JSContext;
 use js::rust::HandleValue;
 use ref_filter_map;
 use std::cell::Cell;
@@ -108,10 +108,9 @@ impl OffscreenCanvas {
 
 impl OffscreenCanvasMethods for OffscreenCanvas {
     // https://html.spec.whatwg.org/multipage/#dom-offscreencanvas-getcontext
-    #[allow(unsafe_code)]
-    unsafe fn GetContext(
+    fn GetContext(
         &self,
-        _cx: *mut JSContext,
+        _cx: JSContext,
         id: DOMString,
         _options: HandleValue,
     ) -> Option<OffscreenRenderingContext> {