diff options
author | Aaron O'Mullan <aaron.omullan@gmail.com> | 2022-01-20 15:11:09 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-01-20 15:11:09 +0100 |
commit | 1cc38f5155bdc5605d74cd959660fa04f782ac63 (patch) | |
tree | 24c435bf3bdb0603625da3286f6133761b5073b5 /serde_v8/src/magic/zero_copy_buf.rs | |
parent | 443d8fc41cab405dbdd967ef7eb86f520517280f (diff) |
feat(serde_v8): deserialize ArrayBuffers (#13436)
Previously we would only deserialize `ArrayBufferView`s as zero-copy bufs
This avoids rewrapping `ArrayBuffers` in `ArrayBufferView`s when implementing APIs that take [BufferSource](https://webidl.spec.whatwg.org/#BufferSource) args passed through the op-layer
Diffstat (limited to 'serde_v8/src/magic/zero_copy_buf.rs')
-rw-r--r-- | serde_v8/src/magic/zero_copy_buf.rs | 57 |
1 files changed, 36 insertions, 21 deletions
diff --git a/serde_v8/src/magic/zero_copy_buf.rs b/serde_v8/src/magic/zero_copy_buf.rs index b536f5859..30acd8137 100644 --- a/serde_v8/src/magic/zero_copy_buf.rs +++ b/serde_v8/src/magic/zero_copy_buf.rs @@ -25,31 +25,46 @@ pub struct ZeroCopyBuf { unsafe impl Send for ZeroCopyBuf {} impl ZeroCopyBuf { - pub fn new<'s>( - scope: &mut v8::HandleScope<'s>, - view: v8::Local<v8::ArrayBufferView>, - ) -> Self { - Self::try_new(scope, view).unwrap() - } - - pub fn try_new<'s>( - scope: &mut v8::HandleScope<'s>, - view: v8::Local<v8::ArrayBufferView>, + pub fn from_buffer( + buffer: v8::Local<v8::ArrayBuffer>, + byte_offset: usize, + byte_length: usize, ) -> Result<Self, v8::DataError> { - let backing_store = view.buffer(scope).unwrap().get_backing_store(); - if backing_store.is_shared() { - return Err(v8::DataError::BadType { + let backing_store = buffer.get_backing_store(); + match backing_store.is_shared() { + true => Err(v8::DataError::BadType { actual: "shared ArrayBufferView", expected: "non-shared ArrayBufferView", - }); + }), + false => Ok(Self { + backing_store, + byte_offset, + byte_length, + }), } - let byte_offset = view.byte_offset(); - let byte_length = view.byte_length(); - Ok(Self { - backing_store, - byte_offset, - byte_length, - }) + } +} + +impl<'s> TryFrom<v8::Local<'s, v8::ArrayBuffer>> for ZeroCopyBuf { + type Error = v8::DataError; + fn try_from(buffer: v8::Local<v8::ArrayBuffer>) -> Result<Self, Self::Error> { + Self::from_buffer(buffer, 0, buffer.byte_length()) + } +} + +// TODO(@AaronO): consider streamlining this as "ScopedValue" ? +type ScopedView<'a, 'b, 's> = ( + &'s mut v8::HandleScope<'a>, + v8::Local<'b, v8::ArrayBufferView>, +); +impl<'a, 'b, 's> TryFrom<ScopedView<'a, 'b, 's>> for ZeroCopyBuf { + type Error = v8::DataError; + fn try_from( + scoped_view: ScopedView<'a, 'b, 's>, + ) -> Result<Self, Self::Error> { + let (scope, view) = scoped_view; + let buffer = view.buffer(scope).unwrap(); + Self::from_buffer(buffer, view.byte_offset(), view.byte_length()) } } |