update to neon 0.10 – buffer access

- no longer has to happen in a borrow closure

Author: samizdatco

src/canvas.rs

@@ -1,6 +1,6 @@
 #![allow(non_snake_case)]
 use std::cell::RefCell;
-use neon::prelude::*;
+use neon::{prelude::*, types::buffer::TypedArray};
 
 use crate::utils::*;
 use crate::context::page::pages_arg;
@@ -94,10 +94,8 @@ pub fn toBuffer(mut cx: FunctionContext) -> JsResult<JsUndefined> {
 
       let args = match encoded{
         Ok(data) => {
-          let mut buffer = JsBuffer::new(&mut cx, data.len() as u32).unwrap();
-          cx.borrow_mut(&mut buffer, |buf_data| {
-            buf_data.as_mut_slice().copy_from_slice(&data);
-          });
+          let mut buffer = cx.buffer(data.len())?;
+          buffer.as_mut_slice(&mut cx).copy_from_slice(&data);
           vec![
             cx.string("ok").upcast::<JsValue>(),
             buffer.upcast::<JsValue>(),
@@ -136,10 +134,8 @@ pub fn toBufferSync(mut cx: FunctionContext) -> JsResult<JsValue> {
 
     match encoded{
       Ok(data) => {
-        let mut buffer = JsBuffer::new(&mut cx, data.len() as u32).unwrap();
-        cx.borrow_mut(&mut buffer, |buf_data| {
-          buf_data.as_mut_slice().copy_from_slice(&data);
-        });
+        let mut buffer = cx.buffer(data.len())?;
+        buffer.as_mut_slice(&mut cx).copy_from_slice(&data);
         Ok(buffer.upcast::<JsValue>())
       },
       Err(msg) => cx.throw_error(msg)

src/context/api.rs

@@ -5,7 +5,7 @@
 #![allow(non_snake_case)]
 use std::f32::consts::PI;
 use std::cell::RefCell;
-use neon::prelude::*;
+use neon::{prelude::*, types::buffer::TypedArray};
 use skia_safe::{Point, Rect, Matrix, Path, PathDirection, PaintStyle};
 use skia_safe::path::AddPathMode::Append;
 use skia_safe::path::AddPathMode::Extend;
@@ -739,10 +739,9 @@ pub fn getImageData(mut cx: FunctionContext) -> JsResult<JsBuffer> {
   let width = float_arg(&mut cx, 3, "width")? as i32;
   let height = float_arg(&mut cx, 4, "height")? as i32;
 
-  let buffer = JsBuffer::new(&mut cx, 4 * (width * height) as u32)?;
-  cx.borrow(&buffer, |data| {
-    this.get_pixels(data.as_mut_slice(), (x, y), (width, height));
-  });
+  let mut buffer = cx.buffer(4 * (width * height) as usize)?;
+  this.get_pixels(buffer.as_mut_slice(&mut cx), (x, y), (width, height));
+
   Ok(buffer)
 }
 
@@ -771,11 +770,9 @@ pub fn putImageData(mut cx: FunctionContext) -> JsResult<JsUndefined> {
       Rect::from_xywh(x, y, width, height)
   )};
 
-  let buffer = img_data.get(&mut cx, "data")?.downcast_or_throw::<JsBuffer, _>(&mut cx)?;
+  let buffer: Handle<JsBuffer> = img_data.get(&mut cx, "data")?;
   let info = Image::info(width, height);
-  cx.borrow(&buffer, |data| {
-    this.blit_pixels(data.as_slice(), &info, &src, &dst);
-  });
+  this.blit_pixels(buffer.as_slice(&cx), &info, &src, &dst);
   Ok(cx.undefined())
 }
 

src/image.rs

@@ -3,7 +3,7 @@
 #![allow(unused_variables)]
 #![allow(dead_code)]
 use std::cell::RefCell;
-use neon::prelude::*;
+use neon::{prelude::*, types::buffer::TypedArray};
 use skia_safe::{Image as SkImage, ImageInfo, Size, ColorType, AlphaType, Data};
 
 use crate::utils::*;
@@ -64,9 +64,7 @@ pub fn set_data(mut cx: FunctionContext) -> JsResult<JsBoolean> {
   let mut this = this.borrow_mut();
 
   let buffer = cx.argument::<JsBuffer>(1)?;
-  let data = cx.borrow(&buffer, |buf_data| {
-    Data::new_copy(buf_data.as_slice())
-  });
+  let data = Data::new_copy(buffer.as_slice(&mut cx));
 
   this.image = SkImage::from_encoded(data);
   Ok(cx.boolean(this.image.is_some()))