RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 16:27:35 +00:00
Code Issues Activity Actions

LibWeb: Implement Web::FileAPI::Blob::array_buffer to spec

Browse source
This commit is contained in:
Shannon Booth 2023-06-15 20:29:54 +12:00 • committed by Andreas Kling
parent b0bc8f2282
commit 501b698385
2 changed files with 25 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

38
Userland/Libraries/LibWeb/FileAPI/Blob.cpp
View file

@ -15,6 +15,7 @@
#include <LibWeb/FileAPI/Blob.h> #include <LibWeb/FileAPI/Blob.h>
#include <LibWeb/Infra/Strings.h> #include <LibWeb/Infra/Strings.h>
#include <LibWeb/Streams/AbstractOperations.h> #include <LibWeb/Streams/AbstractOperations.h>
#include <LibWeb/Streams/ReadableStreamDefaultReader.h>
#include <LibWeb/WebIDL/AbstractOperations.h> #include <LibWeb/WebIDL/AbstractOperations.h>
namespace Web::FileAPI { namespace Web::FileAPI {
@ -336,25 +337,34 @@ WebIDL::ExceptionOr<JS::NonnullGCPtr<JS::Promise>> Blob::text()
} }
// https://w3c.github.io/FileAPI/#dom-blob-arraybuffer // https://w3c.github.io/FileAPI/#dom-blob-arraybuffer
JS::Promise* Blob::array_buffer() WebIDL::ExceptionOr<JS::NonnullGCPtr<JS::Promise>> Blob::array_buffer()
{ {
// FIXME: 1. Let stream be the result of calling get stream on this. auto& realm = this->realm();
// FIXME: 2. Let reader be the result of getting a reader from stream. If that threw an exception, return a new promise rejected with that exception. auto& vm = realm.vm();
// FIXME: We still need to implement ReadableStream for this step to be fully valid. // 1. Let stream be the result of calling get stream on this.
// 3. Let promise be the result of reading all bytes from stream with reader. auto stream = TRY(this->get_stream());
auto promise = JS::Promise::create(realm());
auto buffer_result = JS::ArrayBuffer::create(realm(), m_byte_buffer.size()); // 2. Let reader be the result of getting a reader from stream. If that threw an exception, return a new promise rejected with that exception.
if (buffer_result.is_error()) { auto reader_or_exception = acquire_readable_stream_default_reader(*stream);
promise->reject(buffer_result.release_error().value().release_value()); if (reader_or_exception.is_exception()) {
return promise; auto throw_completion = Bindings::dom_exception_to_throw_completion(vm, reader_or_exception.exception());
auto promise_capability = WebIDL::create_rejected_promise(realm, *throw_completion.value());
return JS::NonnullGCPtr { verify_cast<JS::Promise>(*promise_capability->promise().ptr()) };
} }
auto buffer = buffer_result.release_value(); auto reader = reader_or_exception.release_value();
buffer->buffer().overwrite(0, m_byte_buffer.data(), m_byte_buffer.size());
// 3. Let promise be the result of reading all bytes from stream with reader.
auto promise = TRY(reader->read_all_bytes_deprecated());
// 4. Return the result of transforming promise by a fulfillment handler that returns a new ArrayBuffer whose contents are its first argument. // 4. Return the result of transforming promise by a fulfillment handler that returns a new ArrayBuffer whose contents are its first argument.
promise->fulfill(buffer); return WebIDL::upon_fulfillment(*promise, [&](auto const& first_argument) -> WebIDL::ExceptionOr<JS::Value> {
return promise; auto const& object = first_argument.as_object();
VERIFY(is<JS::ArrayBuffer>(object));
auto const& buffer = static_cast<const JS::ArrayBuffer&>(object).buffer();
return JS::ArrayBuffer::create(realm, buffer);
});
} }
} }

2
Userland/Libraries/LibWeb/FileAPI/Blob.h
View file

@ -45,7 +45,7 @@ public:
WebIDL::ExceptionOr<JS::NonnullGCPtr<Streams::ReadableStream>> stream(); WebIDL::ExceptionOr<JS::NonnullGCPtr<Streams::ReadableStream>> stream();
WebIDL::ExceptionOr<JS::NonnullGCPtr<JS::Promise>> text(); WebIDL::ExceptionOr<JS::NonnullGCPtr<JS::Promise>> text();
JS::Promise* array_buffer(); WebIDL::ExceptionOr<JS::NonnullGCPtr<JS::Promise>> array_buffer();
ReadonlyBytes bytes() const { return m_byte_buffer.bytes(); } ReadonlyBytes bytes() const { return m_byte_buffer.bytes(); }