diff options
| -rw-r--r-- | components/script/dom/canvasrenderingcontext2d.rs | 12 | ||||
| -rw-r--r-- | components/script/dom/imagedata.rs | 8 |
2 files changed, 12 insertions, 8 deletions
diff --git a/components/script/dom/canvasrenderingcontext2d.rs b/components/script/dom/canvasrenderingcontext2d.rs index 28ba1acfc44..07338d8b731 100644 --- a/components/script/dom/canvasrenderingcontext2d.rs +++ b/components/script/dom/canvasrenderingcontext2d.rs @@ -998,15 +998,15 @@ impl CanvasRenderingContext2DMethods for CanvasRenderingContext2D { let sw = cmp::max(1, sw.abs().to_u32().unwrap()); let sh = cmp::max(1, sh.abs().to_u32().unwrap()); - Ok(ImageData::new(&self.global(), sw, sh, None)) + ImageData::new(&self.global(), sw, sh, None) } // https://html.spec.whatwg.org/multipage/#dom-context-2d-createimagedata fn CreateImageData_(&self, imagedata: &ImageData) -> Fallible<Root<ImageData>> { - Ok(ImageData::new(&self.global(), - imagedata.Width(), - imagedata.Height(), - None)) + ImageData::new(&self.global(), + imagedata.Width(), + imagedata.Height(), + None) } // https://html.spec.whatwg.org/multipage/#dom-context-2d-getimagedata @@ -1059,7 +1059,7 @@ impl CanvasRenderingContext2DMethods for CanvasRenderingContext2D { chunk[2] = UNPREMULTIPLY_TABLE[256 * alpha + chunk[2] as usize]; } - Ok(ImageData::new(&self.global(), sw, sh, Some(data))) + ImageData::new(&self.global(), sw, sh, Some(data)) } // https://html.spec.whatwg.org/multipage/#dom-context-2d-putimagedata diff --git a/components/script/dom/imagedata.rs b/components/script/dom/imagedata.rs index d3adb0f3f76..220ead847e8 100644 --- a/components/script/dom/imagedata.rs +++ b/components/script/dom/imagedata.rs @@ -28,7 +28,11 @@ pub struct ImageData { impl ImageData { #[allow(unsafe_code)] - pub fn new(global: &GlobalScope, width: u32, height: u32, mut data: Option<Vec<u8>>) -> Root<ImageData> { + pub fn new(global: &GlobalScope, + width: u32, + height: u32, + mut data: Option<Vec<u8>>) + -> Fallible<Root<ImageData>> { let len = width * height * 4; unsafe { let cx = global.get_cx(); @@ -41,7 +45,7 @@ impl ImageData { None => CreateWith::Length(len), }; Uint8ClampedArray::create(cx, data, js_object.handle_mut()).unwrap(); - Self::new_with_jsobject(global, width, Some(height), Some(js_object.get())).unwrap() + Self::new_with_jsobject(global, width, Some(height), Some(js_object.get())) } } |