mirror of
https://github.com/LadybirdBrowser/ladybird.git
synced 2025-08-05 07:41:01 +00:00
LibWeb/Streams: Move "set up transform stream" to TransformStream
This is not marked as an AO in the spec, and is a publically exported API exposed on TransformStream.
This commit is contained in:
parent
3f572d9ab7
commit
19bbfb023a
Notes:
github-actions[bot]
2024-12-11 14:12:37 +00:00
Author: https://github.com/shannonbooth
Commit: 19bbfb023a
Pull-request: https://github.com/LadybirdBrowser/ladybird/pull/2831
Reviewed-by: https://github.com/kennethmyhra ✅
Reviewed-by: https://github.com/trflynn89
7 changed files with 84 additions and 82 deletions
|
@ -76,7 +76,7 @@ WebIDL::ExceptionOr<GC::Ref<CompressionStream>> CompressionStream::construct_imp
|
||||||
});
|
});
|
||||||
|
|
||||||
// 6. Set up this's transform with transformAlgorithm set to transformAlgorithm and flushAlgorithm set to flushAlgorithm.
|
// 6. Set up this's transform with transformAlgorithm set to transformAlgorithm and flushAlgorithm set to flushAlgorithm.
|
||||||
Streams::transform_stream_set_up(stream->m_transform, transform_algorithm, flush_algorithm);
|
stream->m_transform->set_up(transform_algorithm, flush_algorithm);
|
||||||
|
|
||||||
return stream;
|
return stream;
|
||||||
}
|
}
|
||||||
|
|
|
@ -77,7 +77,7 @@ WebIDL::ExceptionOr<GC::Ref<DecompressionStream>> DecompressionStream::construct
|
||||||
});
|
});
|
||||||
|
|
||||||
// 6. Set up this's transform with transformAlgorithm set to transformAlgorithm and flushAlgorithm set to flushAlgorithm.
|
// 6. Set up this's transform with transformAlgorithm set to transformAlgorithm and flushAlgorithm set to flushAlgorithm.
|
||||||
Streams::transform_stream_set_up(stream->m_transform, transform_algorithm, flush_algorithm);
|
stream->m_transform->set_up(transform_algorithm, flush_algorithm);
|
||||||
|
|
||||||
return stream;
|
return stream;
|
||||||
}
|
}
|
||||||
|
|
|
@ -741,7 +741,7 @@ void fetch_response_handover(JS::Realm& realm, Infrastructure::FetchParams const
|
||||||
process_response_end_of_body();
|
process_response_end_of_body();
|
||||||
return WebIDL::create_resolved_promise(realm, JS::js_undefined());
|
return WebIDL::create_resolved_promise(realm, JS::js_undefined());
|
||||||
});
|
});
|
||||||
Streams::transform_stream_set_up(transform_stream, identity_transform_algorithm, flush_algorithm);
|
transform_stream->set_up(identity_transform_algorithm, flush_algorithm);
|
||||||
|
|
||||||
// 4. Set internalResponse’s body’s stream to the result of internalResponse’s body’s stream piped through transformStream.
|
// 4. Set internalResponse’s body’s stream to the result of internalResponse’s body’s stream piped through transformStream.
|
||||||
auto promise = Streams::readable_stream_pipe_to(internal_response->body()->stream(), transform_stream->writable(), false, false, false, {});
|
auto promise = Streams::readable_stream_pipe_to(internal_response->body()->stream(), transform_stream->writable(), false, false, false, {});
|
||||||
|
|
|
@ -5176,84 +5176,6 @@ void transform_stream_set_backpressure(TransformStream& stream, bool backpressur
|
||||||
stream.set_backpressure(backpressure);
|
stream.set_backpressure(backpressure);
|
||||||
}
|
}
|
||||||
|
|
||||||
// https://streams.spec.whatwg.org/#transformstream-set-up
|
|
||||||
void transform_stream_set_up(TransformStream& stream, GC::Ref<TransformAlgorithm> transform_algorithm, GC::Ptr<FlushAlgorithm> flush_algorithm, GC::Ptr<CancelAlgorithm> cancel_algorithm)
|
|
||||||
{
|
|
||||||
auto& realm = stream.realm();
|
|
||||||
|
|
||||||
// 1. Let writableHighWaterMark be 1.
|
|
||||||
auto writable_high_water_mark = 1.0;
|
|
||||||
|
|
||||||
// 2. Let writableSizeAlgorithm be an algorithm that returns 1.
|
|
||||||
auto writable_size_algorithm = GC::create_function(realm.heap(), [](JS::Value) {
|
|
||||||
return JS::normal_completion(JS::Value { 1 });
|
|
||||||
});
|
|
||||||
|
|
||||||
// 3. Let readableHighWaterMark be 0.
|
|
||||||
auto readable_high_water_mark = 0.0;
|
|
||||||
|
|
||||||
// 4. Let readableSizeAlgorithm be an algorithm that returns 1.
|
|
||||||
auto readable_size_algorithm = GC::create_function(realm.heap(), [](JS::Value) {
|
|
||||||
return JS::normal_completion(JS::Value { 1 });
|
|
||||||
});
|
|
||||||
|
|
||||||
// 5. Let transformAlgorithmWrapper be an algorithm that runs these steps given a value chunk:
|
|
||||||
auto transform_algorithm_wrapper = GC::create_function(realm.heap(), [&realm, transform_algorithm](JS::Value chunk) -> GC::Ref<WebIDL::Promise> {
|
|
||||||
// 1. Let result be the result of running transformAlgorithm given chunk. If this throws an exception e, return a promise rejected with e.
|
|
||||||
GC::Ptr<JS::PromiseCapability> result = nullptr;
|
|
||||||
result = transform_algorithm->function()(chunk);
|
|
||||||
|
|
||||||
// 2. If result is a Promise, then return result.
|
|
||||||
if (result)
|
|
||||||
return GC::Ref { *result };
|
|
||||||
|
|
||||||
// 3. Return a promise resolved with undefined.
|
|
||||||
return WebIDL::create_resolved_promise(realm, JS::js_undefined());
|
|
||||||
});
|
|
||||||
|
|
||||||
// 6. Let flushAlgorithmWrapper be an algorithm that runs these steps:
|
|
||||||
auto flush_algorithm_wrapper = GC::create_function(realm.heap(), [&realm, flush_algorithm]() -> GC::Ref<WebIDL::Promise> {
|
|
||||||
// 1. Let result be the result of running flushAlgorithm, if flushAlgorithm was given, or null otherwise. If this throws an exception e, return a promise rejected with e.
|
|
||||||
GC::Ptr<JS::PromiseCapability> result = nullptr;
|
|
||||||
if (flush_algorithm)
|
|
||||||
result = flush_algorithm->function()();
|
|
||||||
|
|
||||||
// 2. If result is a Promise, then return result.
|
|
||||||
if (result)
|
|
||||||
return GC::Ref { *result };
|
|
||||||
|
|
||||||
// 3. Return a promise resolved with undefined.
|
|
||||||
return WebIDL::create_resolved_promise(realm, JS::js_undefined());
|
|
||||||
});
|
|
||||||
|
|
||||||
// 7. Let cancelAlgorithmWrapper be an algorithm that runs these steps given a value reason:
|
|
||||||
auto cancel_algorithm_wrapper = GC::create_function(realm.heap(), [&realm, cancel_algorithm](JS::Value reason) -> GC::Ref<WebIDL::Promise> {
|
|
||||||
// 1. Let result be the result of running cancelAlgorithm given reason, if cancelAlgorithm was given, or null otherwise. If this throws an exception e, return a promise rejected with e.
|
|
||||||
GC::Ptr<JS::PromiseCapability> result = nullptr;
|
|
||||||
if (cancel_algorithm)
|
|
||||||
result = cancel_algorithm->function()(reason);
|
|
||||||
|
|
||||||
// 2. If result is a Promise, then return result.
|
|
||||||
if (result)
|
|
||||||
return GC::Ref { *result };
|
|
||||||
|
|
||||||
// 3. Return a promise resolved with undefined.
|
|
||||||
return WebIDL::create_resolved_promise(realm, JS::js_undefined());
|
|
||||||
});
|
|
||||||
|
|
||||||
// 8. Let startPromise be a promise resolved with undefined.
|
|
||||||
auto start_promise = WebIDL::create_resolved_promise(realm, JS::js_undefined());
|
|
||||||
|
|
||||||
// 9. Perform ! InitializeTransformStream(stream, startPromise, writableHighWaterMark, writableSizeAlgorithm, readableHighWaterMark, readableSizeAlgorithm).
|
|
||||||
initialize_transform_stream(stream, start_promise, writable_high_water_mark, writable_size_algorithm, readable_high_water_mark, readable_size_algorithm);
|
|
||||||
|
|
||||||
// 10. Let controller be a new TransformStreamDefaultController.
|
|
||||||
auto controller = realm.create<TransformStreamDefaultController>(realm);
|
|
||||||
|
|
||||||
// 11. Perform ! SetUpTransformStreamDefaultController(stream, controller, transformAlgorithmWrapper, flushAlgorithmWrapper, cancelAlgorithmWrapper).
|
|
||||||
set_up_transform_stream_default_controller(stream, controller, transform_algorithm_wrapper, flush_algorithm_wrapper, cancel_algorithm_wrapper);
|
|
||||||
}
|
|
||||||
|
|
||||||
// https://streams.spec.whatwg.org/#transform-stream-unblock-write
|
// https://streams.spec.whatwg.org/#transform-stream-unblock-write
|
||||||
void transform_stream_unblock_write(TransformStream& stream)
|
void transform_stream_unblock_write(TransformStream& stream)
|
||||||
{
|
{
|
||||||
|
|
|
@ -172,7 +172,6 @@ GC::Ref<WebIDL::Promise> transform_stream_default_source_cancel_algorithm(Transf
|
||||||
void transform_stream_error(TransformStream&, JS::Value error);
|
void transform_stream_error(TransformStream&, JS::Value error);
|
||||||
void transform_stream_error_writable_and_unblock_write(TransformStream&, JS::Value error);
|
void transform_stream_error_writable_and_unblock_write(TransformStream&, JS::Value error);
|
||||||
void transform_stream_set_backpressure(TransformStream&, bool backpressure);
|
void transform_stream_set_backpressure(TransformStream&, bool backpressure);
|
||||||
void transform_stream_set_up(TransformStream&, GC::Ref<TransformAlgorithm>, GC::Ptr<FlushAlgorithm> = {}, GC::Ptr<CancelAlgorithm> = {});
|
|
||||||
void transform_stream_unblock_write(TransformStream&);
|
void transform_stream_unblock_write(TransformStream&);
|
||||||
|
|
||||||
bool is_non_negative_number(JS::Value);
|
bool is_non_negative_number(JS::Value);
|
||||||
|
|
|
@ -74,6 +74,84 @@ WebIDL::ExceptionOr<GC::Ref<TransformStream>> TransformStream::construct_impl(JS
|
||||||
return stream;
|
return stream;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// https://streams.spec.whatwg.org/#transformstream-set-up
|
||||||
|
void TransformStream::set_up(GC::Ref<TransformAlgorithm> transform_algorithm, GC::Ptr<FlushAlgorithm> flush_algorithm, GC::Ptr<CancelAlgorithm> cancel_algorithm)
|
||||||
|
{
|
||||||
|
auto& realm = this->realm();
|
||||||
|
|
||||||
|
// 1. Let writableHighWaterMark be 1.
|
||||||
|
auto writable_high_water_mark = 1.0;
|
||||||
|
|
||||||
|
// 2. Let writableSizeAlgorithm be an algorithm that returns 1.
|
||||||
|
auto writable_size_algorithm = GC::create_function(realm.heap(), [](JS::Value) {
|
||||||
|
return JS::normal_completion(JS::Value { 1 });
|
||||||
|
});
|
||||||
|
|
||||||
|
// 3. Let readableHighWaterMark be 0.
|
||||||
|
auto readable_high_water_mark = 0.0;
|
||||||
|
|
||||||
|
// 4. Let readableSizeAlgorithm be an algorithm that returns 1.
|
||||||
|
auto readable_size_algorithm = GC::create_function(realm.heap(), [](JS::Value) {
|
||||||
|
return JS::normal_completion(JS::Value { 1 });
|
||||||
|
});
|
||||||
|
|
||||||
|
// 5. Let transformAlgorithmWrapper be an algorithm that runs these steps given a value chunk:
|
||||||
|
auto transform_algorithm_wrapper = GC::create_function(realm.heap(), [&realm, transform_algorithm](JS::Value chunk) -> GC::Ref<WebIDL::Promise> {
|
||||||
|
// 1. Let result be the result of running transformAlgorithm given chunk. If this throws an exception e, return a promise rejected with e.
|
||||||
|
GC::Ptr<JS::PromiseCapability> result = nullptr;
|
||||||
|
result = transform_algorithm->function()(chunk);
|
||||||
|
|
||||||
|
// 2. If result is a Promise, then return result.
|
||||||
|
if (result)
|
||||||
|
return GC::Ref { *result };
|
||||||
|
|
||||||
|
// 3. Return a promise resolved with undefined.
|
||||||
|
return WebIDL::create_resolved_promise(realm, JS::js_undefined());
|
||||||
|
});
|
||||||
|
|
||||||
|
// 6. Let flushAlgorithmWrapper be an algorithm that runs these steps:
|
||||||
|
auto flush_algorithm_wrapper = GC::create_function(realm.heap(), [&realm, flush_algorithm]() -> GC::Ref<WebIDL::Promise> {
|
||||||
|
// 1. Let result be the result of running flushAlgorithm, if flushAlgorithm was given, or null otherwise. If this throws an exception e, return a promise rejected with e.
|
||||||
|
GC::Ptr<JS::PromiseCapability> result = nullptr;
|
||||||
|
if (flush_algorithm)
|
||||||
|
result = flush_algorithm->function()();
|
||||||
|
|
||||||
|
// 2. If result is a Promise, then return result.
|
||||||
|
if (result)
|
||||||
|
return GC::Ref { *result };
|
||||||
|
|
||||||
|
// 3. Return a promise resolved with undefined.
|
||||||
|
return WebIDL::create_resolved_promise(realm, JS::js_undefined());
|
||||||
|
});
|
||||||
|
|
||||||
|
// 7. Let cancelAlgorithmWrapper be an algorithm that runs these steps given a value reason:
|
||||||
|
auto cancel_algorithm_wrapper = GC::create_function(realm.heap(), [&realm, cancel_algorithm](JS::Value reason) -> GC::Ref<WebIDL::Promise> {
|
||||||
|
// 1. Let result be the result of running cancelAlgorithm given reason, if cancelAlgorithm was given, or null otherwise. If this throws an exception e, return a promise rejected with e.
|
||||||
|
GC::Ptr<JS::PromiseCapability> result = nullptr;
|
||||||
|
if (cancel_algorithm)
|
||||||
|
result = cancel_algorithm->function()(reason);
|
||||||
|
|
||||||
|
// 2. If result is a Promise, then return result.
|
||||||
|
if (result)
|
||||||
|
return GC::Ref { *result };
|
||||||
|
|
||||||
|
// 3. Return a promise resolved with undefined.
|
||||||
|
return WebIDL::create_resolved_promise(realm, JS::js_undefined());
|
||||||
|
});
|
||||||
|
|
||||||
|
// 8. Let startPromise be a promise resolved with undefined.
|
||||||
|
auto start_promise = WebIDL::create_resolved_promise(realm, JS::js_undefined());
|
||||||
|
|
||||||
|
// 9. Perform ! InitializeTransformStream(stream, startPromise, writableHighWaterMark, writableSizeAlgorithm, readableHighWaterMark, readableSizeAlgorithm).
|
||||||
|
initialize_transform_stream(*this, start_promise, writable_high_water_mark, writable_size_algorithm, readable_high_water_mark, readable_size_algorithm);
|
||||||
|
|
||||||
|
// 10. Let controller be a new TransformStreamDefaultController.
|
||||||
|
auto controller = realm.create<TransformStreamDefaultController>(realm);
|
||||||
|
|
||||||
|
// 11. Perform ! SetUpTransformStreamDefaultController(stream, controller, transformAlgorithmWrapper, flushAlgorithmWrapper, cancelAlgorithmWrapper).
|
||||||
|
set_up_transform_stream_default_controller(*this, controller, transform_algorithm_wrapper, flush_algorithm_wrapper, cancel_algorithm_wrapper);
|
||||||
|
}
|
||||||
|
|
||||||
TransformStream::TransformStream(JS::Realm& realm)
|
TransformStream::TransformStream(JS::Realm& realm)
|
||||||
: Bindings::PlatformObject(realm)
|
: Bindings::PlatformObject(realm)
|
||||||
{
|
{
|
||||||
|
|
|
@ -9,6 +9,7 @@
|
||||||
#include <LibJS/Forward.h>
|
#include <LibJS/Forward.h>
|
||||||
#include <LibWeb/Bindings/PlatformObject.h>
|
#include <LibWeb/Bindings/PlatformObject.h>
|
||||||
#include <LibWeb/Forward.h>
|
#include <LibWeb/Forward.h>
|
||||||
|
#include <LibWeb/Streams/Algorithms.h>
|
||||||
#include <LibWeb/Streams/QueuingStrategy.h>
|
#include <LibWeb/Streams/QueuingStrategy.h>
|
||||||
#include <LibWeb/WebIDL/Promise.h>
|
#include <LibWeb/WebIDL/Promise.h>
|
||||||
|
|
||||||
|
@ -40,6 +41,8 @@ public:
|
||||||
GC::Ptr<TransformStreamDefaultController> controller() const { return m_controller; }
|
GC::Ptr<TransformStreamDefaultController> controller() const { return m_controller; }
|
||||||
void set_controller(GC::Ptr<TransformStreamDefaultController> value) { m_controller = value; }
|
void set_controller(GC::Ptr<TransformStreamDefaultController> value) { m_controller = value; }
|
||||||
|
|
||||||
|
void set_up(GC::Ref<TransformAlgorithm>, GC::Ptr<FlushAlgorithm> = {}, GC::Ptr<CancelAlgorithm> = {});
|
||||||
|
|
||||||
private:
|
private:
|
||||||
explicit TransformStream(JS::Realm& realm);
|
explicit TransformStream(JS::Realm& realm);
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue