mirrors/ladybird
0
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-05-31 23:42:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

LibWeb/CSS: Make fetch_a_style_resource() take URLs not strings

Browse source 
The spec has this parameter as "a url or `<url>`", so let's match that.
This commit is contained in:
Sam Atkins 2025-04-10 10:26:22 +01:00
parent 3fe978c8a0
commit f4cfdd704b
Notes: github-actions[bot] 2025-04-15 09:31:11 +00:00
3 changed files with 13 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Libraries/LibWeb/CSS/CSSImportRule.cpp
View file

@ -116,7 +116,7 @@ void CSSImportRule::fetch()
m_document_load_event_delayer.emplace(*m_document); m_document_load_event_delayer.emplace(*m_document);
// 4. Fetch a style resource from parsedUrl, with stylesheet parentStylesheet, destination "style", CORS mode "no-cors", and processResponse being the following steps given response response and byte stream, null or failure byteStream: // 4. Fetch a style resource from parsedUrl, with stylesheet parentStylesheet, destination "style", CORS mode "no-cors", and processResponse being the following steps given response response and byte stream, null or failure byteStream:
fetch_a_style_resource(parsed_url->to_string(), parent_style_sheet, Fetch::Infrastructure::Request::Destination::Style, CorsMode::NoCors, fetch_a_style_resource(parsed_url.value(), parent_style_sheet, Fetch::Infrastructure::Request::Destination::Style, CorsMode::NoCors,
[strong_this = GC::Ref { *this }, parent_style_sheet = GC::Ref { parent_style_sheet }, parsed_url = parsed_url.value()](auto response, auto maybe_byte_stream) { [strong_this = GC::Ref { *this }, parent_style_sheet = GC::Ref { parent_style_sheet }, parsed_url = parsed_url.value()](auto response, auto maybe_byte_stream) {
// AD-HOC: Stop delaying the load event. // AD-HOC: Stop delaying the load event.
ScopeGuard guard = [strong_this] { ScopeGuard guard = [strong_this] {

9
Libraries/LibWeb/CSS/Fetch.cpp
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2024, Sam Atkins <sam@ladybird.org> * Copyright (c) 2024-2025, Sam Atkins <sam@ladybird.org>
* *
* SPDX-License-Identifier: BSD-2-Clause * SPDX-License-Identifier: BSD-2-Clause
*/ */
@ -12,7 +12,7 @@
namespace Web::CSS { namespace Web::CSS {
// https://drafts.csswg.org/css-values-4/#fetch-a-style-resource // https://drafts.csswg.org/css-values-4/#fetch-a-style-resource
void fetch_a_style_resource(String const& url_value, CSSStyleSheet const& sheet, Fetch::Infrastructure::Request::Destination destination, CorsMode cors_mode, Fetch::Infrastructure::FetchAlgorithms::ProcessResponseConsumeBodyFunction process_response) void fetch_a_style_resource(StyleResourceURL const& url_value, CSSStyleSheet const& sheet, Fetch::Infrastructure::Request::Destination destination, CorsMode cors_mode, Fetch::Infrastructure::FetchAlgorithms::ProcessResponseConsumeBodyFunction process_response)
{ {
auto& vm = sheet.vm(); auto& vm = sheet.vm();
@ -23,7 +23,10 @@ void fetch_a_style_resource(String const& url_value, CSSStyleSheet const& sheet,
auto base = sheet.base_url().value_or(environment_settings.api_base_url()); auto base = sheet.base_url().value_or(environment_settings.api_base_url());
// 3. Let parsedUrl be the result of the URL parser steps with urlValue’s url and base. If the algorithm returns an error, return. // 3. Let parsedUrl be the result of the URL parser steps with urlValue’s url and base. If the algorithm returns an error, return.
auto parsed_url = ::URL::Parser::basic_parse(url_value, base); auto url_string = url_value.visit(
[](::URL::URL const& url) { return url.to_string(); },
[](CSS::URL const& url) { return url.url(); });
auto parsed_url = ::URL::Parser::basic_parse(url_string, base);
if (!parsed_url.has_value()) if (!parsed_url.has_value())
return; return;

9
Libraries/LibWeb/CSS/Fetch.h
View file

@ -1,12 +1,13 @@
/* /*
* Copyright (c) 2024, Sam Atkins <sam@ladybird.org> * Copyright (c) 2024-2025, Sam Atkins <sam@ladybird.org>
* *
* SPDX-License-Identifier: BSD-2-Clause * SPDX-License-Identifier: BSD-2-Clause
*/ */
#pragma once #pragma once
#include <AK/String.h> #include <LibURL/URL.h>
#include <LibWeb/CSS/URL.h>
#include <LibWeb/Fetch/Infrastructure/FetchAlgorithms.h> #include <LibWeb/Fetch/Infrastructure/FetchAlgorithms.h>
#include <LibWeb/Fetch/Infrastructure/HTTP/Requests.h> #include <LibWeb/Fetch/Infrastructure/HTTP/Requests.h>
@ -17,7 +18,9 @@ enum class CorsMode {
Cors, Cors,
}; };
using StyleResourceURL = Variant<::URL::URL, CSS::URL>;
// https://drafts.csswg.org/css-values-4/#fetch-a-style-resource // https://drafts.csswg.org/css-values-4/#fetch-a-style-resource
void fetch_a_style_resource(String const& url, CSSStyleSheet const&, Fetch::Infrastructure::Request::Destination, CorsMode, Fetch::Infrastructure::FetchAlgorithms::ProcessResponseConsumeBodyFunction process_response); void fetch_a_style_resource(StyleResourceURL const& url, CSSStyleSheet const&, Fetch::Infrastructure::Request::Destination, CorsMode, Fetch::Infrastructure::FetchAlgorithms::ProcessResponseConsumeBodyFunction process_response);
} }