From ed673f80708a0a10bef728628c43e975542e4b6c Mon Sep 17 00:00:00 2001 From: Anthony Ramine Date: Sat, 15 Sep 2018 01:11:53 +0200 Subject: [PATCH] Mark some canvas methods as unsafe They use raw JS context pointers. --- components/script/dom/htmlcanvaselement.rs | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/components/script/dom/htmlcanvaselement.rs b/components/script/dom/htmlcanvaselement.rs index cfc1ee9a3db..dd1538b8529 100644 --- a/components/script/dom/htmlcanvaselement.rs +++ b/components/script/dom/htmlcanvaselement.rs @@ -188,7 +188,8 @@ impl HTMLCanvasElement { } } - pub fn get_or_init_webgl_context( + #[allow(unsafe_code)] + unsafe fn get_or_init_webgl_context( &self, cx: *mut JSContext, options: HandleValue, @@ -209,7 +210,8 @@ impl HTMLCanvasElement { } } - pub fn get_or_init_webgl2_context( + #[allow(unsafe_code)] + unsafe fn get_or_init_webgl2_context( &self, cx: *mut JSContext, options: HandleValue, @@ -243,11 +245,14 @@ impl HTMLCanvasElement { } #[allow(unsafe_code)] - fn get_gl_attributes(cx: *mut JSContext, options: HandleValue) -> Option { - match unsafe { WebGLContextAttributes::new(cx, options) } { + unsafe fn get_gl_attributes( + cx: *mut JSContext, + options: HandleValue, + ) -> Option { + match WebGLContextAttributes::new(cx, options) { Ok(ConversionResult::Success(ref attrs)) => Some(From::from(attrs)), Ok(ConversionResult::Failure(ref error)) => { - unsafe { throw_type_error(cx, &error); } + throw_type_error(cx, &error); None } _ => {