diff options
| author | marmeladema <xademax@gmail.com> | 2019-07-22 01:09:24 +0100 |
|---|---|---|
| committer | marmeladema <xademax@gmail.com> | 2019-07-24 08:24:50 +0100 |
| commit | 2c5d0a6ebc39ad263e2bbe623e357a11b4cec5aa (patch) | |
| tree | c1c93f26ab047bb010d1781511a750a302cc5636 /components/script/dom/htmlcanvaselement.rs | |
| parent | 808fa65aef163879b82baddc4af0a5445f806c81 (diff) | |
| download | servo-2c5d0a6ebc39ad263e2bbe623e357a11b4cec5aa.tar.gz servo-2c5d0a6ebc39ad263e2bbe623e357a11b4cec5aa.zip | |
Convert CGTraitInterface to use safe JSContext instead of raw JSContext
Diffstat (limited to 'components/script/dom/htmlcanvaselement.rs')
| -rw-r--r-- | components/script/dom/htmlcanvaselement.rs | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/components/script/dom/htmlcanvaselement.rs b/components/script/dom/htmlcanvaselement.rs index addef4dc666..4e9abe5f3c9 100644 --- a/components/script/dom/htmlcanvaselement.rs +++ b/components/script/dom/htmlcanvaselement.rs @@ -330,9 +330,9 @@ impl HTMLCanvasElementMethods for HTMLCanvasElement { // https://html.spec.whatwg.org/multipage/#dom-canvas-getcontext #[allow(unsafe_code)] - unsafe fn GetContext( + fn GetContext( &self, - cx: *mut JSContext, + cx: SafeJSContext, id: DOMString, options: HandleValue, ) -> Option<RenderingContext> { @@ -340,21 +340,22 @@ impl HTMLCanvasElementMethods for HTMLCanvasElement { "2d" => self .get_or_init_2d_context() .map(RenderingContext::CanvasRenderingContext2D), - "webgl" | "experimental-webgl" => self - .get_or_init_webgl_context(cx, options) - .map(RenderingContext::WebGLRenderingContext), - "webgl2" | "experimental-webgl2" => self - .get_or_init_webgl2_context(cx, options) - .map(RenderingContext::WebGL2RenderingContext), + "webgl" | "experimental-webgl" => unsafe { + self.get_or_init_webgl_context(*cx, options) + .map(RenderingContext::WebGLRenderingContext) + }, + "webgl2" | "experimental-webgl2" => unsafe { + self.get_or_init_webgl2_context(*cx, options) + .map(RenderingContext::WebGL2RenderingContext) + }, _ => None, } } // https://html.spec.whatwg.org/multipage/#dom-canvas-todataurl - #[allow(unsafe_code)] - unsafe fn ToDataURL( + fn ToDataURL( &self, - _context: *mut JSContext, + _context: SafeJSContext, _mime_type: Option<DOMString>, _quality: HandleValue, ) -> Fallible<USVString> { |