Stowage/ladybird
2
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-12-08 06:09:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

LibWeb: Pass the HTMLLinkElement fetched resource around as a ByteBuffer

Browse source 
Instead of passing around a large variant, which can only contain a
ByteBuffer, let's extract the ByteBuffer ahead of time and pass that
around.
This commit is contained in:
Timothy Flynn 2025-11-05 07:17:09 -05:00 • committed by Andreas Kling
parent 523433d57d
commit c61fa1d7aa
Notes: github-actions[bot] 2025-11-05 17:28:52 +00:00
2 changed files with 18 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

27
Libraries/LibWeb/HTML/HTMLLinkElement.cpp
View file

@ -439,19 +439,25 @@ void HTMLLinkElement::default_fetch_and_process_linked_resource()
// 1. Let success be true. // 1. Let success be true.
bool success = true; bool success = true;
ByteBuffer successful_body_bytes;
// 2. If either of the following conditions are met: // 2. If either of the following conditions are met:
// - bodyBytes is null or failure; or // - bodyBytes is null or failure; or
// - response's status is not an ok status, // - response's status is not an ok status,
if (body_bytes.template has<Empty>() || body_bytes.template has<Fetch::Infrastructure::FetchAlgorithms::ConsumeBodyFailureTag>() || !Fetch::Infrastructure::is_ok_status(response->status())) { // then set success to false.
// then set success to false. body_bytes.visit(
success = false; [&](ByteBuffer& body_bytes) {
} if (Fetch::Infrastructure::is_ok_status(response->status()))
successful_body_bytes = move(body_bytes);
else
success = false;
},
[&](auto) { success = false; });
// FIXME: 3. Otherwise, wait for the link resource's critical subresources to finish loading. // FIXME: 3. Otherwise, wait for the link resource's critical subresources to finish loading.
// 4. Process the linked resource given el, success, response, and bodyBytes. // 4. Process the linked resource given el, success, response, and bodyBytes.
process_linked_resource(success, response, body_bytes); process_linked_resource(success, response, move(successful_body_bytes));
}; };
if (m_fetch_controller) if (m_fetch_controller)
@ -499,10 +505,10 @@ bool HTMLLinkElement::stylesheet_linked_resource_fetch_setup_steps(Fetch::Infras
} }
// https://html.spec.whatwg.org/multipage/semantics.html#process-the-linked-resource // https://html.spec.whatwg.org/multipage/semantics.html#process-the-linked-resource
void HTMLLinkElement::process_linked_resource(bool success, Fetch::Infrastructure::Response const& response, Variant<Empty, Fetch::Infrastructure::FetchAlgorithms::ConsumeBodyFailureTag, ByteBuffer> body_bytes) void HTMLLinkElement::process_linked_resource(bool success, Fetch::Infrastructure::Response const& response, ByteBuffer body_bytes)
{ {
if (m_relationship & Relationship::Stylesheet) if (m_relationship & Relationship::Stylesheet)
process_stylesheet_resource(success, response, body_bytes); process_stylesheet_resource(success, response, move(body_bytes));
} }
void HTMLLinkElement::process_icon_resource() void HTMLLinkElement::process_icon_resource()
@ -519,7 +525,7 @@ void HTMLLinkElement::process_icon_resource()
} }
// https://html.spec.whatwg.org/multipage/links.html#link-type-stylesheet:process-the-linked-resource // https://html.spec.whatwg.org/multipage/links.html#link-type-stylesheet:process-the-linked-resource
void HTMLLinkElement::process_stylesheet_resource(bool success, Fetch::Infrastructure::Response const& response, Variant<Empty, Fetch::Infrastructure::FetchAlgorithms::ConsumeBodyFailureTag, ByteBuffer> body_bytes) void HTMLLinkElement::process_stylesheet_resource(bool success, Fetch::Infrastructure::Response const& response, ByteBuffer body_bytes)
{ {
// 1. If the resource's Content-Type metadata is not text/css, then set success to false. // 1. If the resource's Content-Type metadata is not text/css, then set success to false.
auto mime_type_string = m_mime_type; auto mime_type_string = m_mime_type;
@ -532,9 +538,8 @@ void HTMLLinkElement::process_stylesheet_resource(bool success, Fetch::Infrastru
mime_type_charset = charset.value(); mime_type_charset = charset.value();
} }
if (mime_type_string.has_value() && mime_type_string != "text/css"sv) { if (mime_type_string.has_value() && mime_type_string != "text/css"sv)
success = false; success = false;
}
// FIXME: 2. If el no longer creates an external resource link that contributes to the styling processing model, // FIXME: 2. If el no longer creates an external resource link that contributes to the styling processing model,
// or if, since the resource in question was fetched, it has become appropriate to fetch it again, then return. // or if, since the resource in question was fetched, it has become appropriate to fetch it again, then return.
@ -581,7 +586,7 @@ void HTMLLinkElement::process_stylesheet_resource(bool success, Fetch::Infrastru
if (!environment_encoding.has_value() && document().encoding().has_value()) if (!environment_encoding.has_value() && document().encoding().has_value())
environment_encoding = document().encoding().value(); environment_encoding = document().encoding().value();
auto maybe_decoded_string = css_decode_bytes(environment_encoding, mime_type_charset, body_bytes.get<ByteBuffer>()); auto maybe_decoded_string = css_decode_bytes(environment_encoding, mime_type_charset, body_bytes);
if (maybe_decoded_string.is_error()) { if (maybe_decoded_string.is_error()) {
dbgln("Failed to decode CSS file: {}", response.url().value_or(URL::URL())); dbgln("Failed to decode CSS file: {}", response.url().value_or(URL::URL()));
dispatch_event(*DOM::Event::create(realm(), HTML::EventNames::error)); dispatch_event(*DOM::Event::create(realm(), HTML::EventNames::error));

4
Libraries/LibWeb/HTML/HTMLLinkElement.h
View file

@ -139,9 +139,9 @@ private:
bool linked_resource_fetch_setup_steps(Fetch::Infrastructure::Request&); bool linked_resource_fetch_setup_steps(Fetch::Infrastructure::Request&);
bool stylesheet_linked_resource_fetch_setup_steps(Fetch::Infrastructure::Request&); bool stylesheet_linked_resource_fetch_setup_steps(Fetch::Infrastructure::Request&);
void process_linked_resource(bool success, Fetch::Infrastructure::Response const&, Variant<Empty, Fetch::Infrastructure::FetchAlgorithms::ConsumeBodyFailureTag, ByteBuffer>); void process_linked_resource(bool success, Fetch::Infrastructure::Response const&, ByteBuffer);
void process_icon_resource(); void process_icon_resource();
void process_stylesheet_resource(bool success, Fetch::Infrastructure::Response const&, Variant<Empty, Fetch::Infrastructure::FetchAlgorithms::ConsumeBodyFailureTag, ByteBuffer>); void process_stylesheet_resource(bool success, Fetch::Infrastructure::Response const&, ByteBuffer);
struct Relationship { struct Relationship {
enum { enum {