fergalmoran/ladybird
1
0
Fork 0
mirror of https://github.com/fergalmoran/ladybird.git synced 2025-12-23 01:39:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

LibWeb: Return OptionalNone from DOMURL::parse on failure

Browse Source 
This ports one more function away from needing to use the awkward
valid state of the URL class.
This commit is contained in:
Shannon Booth
2025-01-22 17:35:52 +13:00
committed by Sam Atkins
parent b81d6945dc
commit fd27eef0d1
18 changed files with 63 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Libraries/LibWeb/HTML/Scripting/ImportMap.cpp
View File

@@ -202,7 +202,7 @@ WebIDL::ExceptionOr<HashMap<URL::URL, ModuleSpecifierMap>> sort_and_normalise_sc
auto scope_prefix_url = DOMURL::parse(scope_prefix.as_string(), base_url);
// 3. If scopePrefixURL is failure, then:
if (!scope_prefix_url.is_valid()) {
if (!scope_prefix_url.has_value()) {
// 1. The user agent may report a warning to the console that the scope prefix URL was not parseable.
auto& console = realm.intrinsics().console_object()->console();
console.output_debug_message(JS::Console::LogLevel::Warn,
@@ -213,7 +213,7 @@ WebIDL::ExceptionOr<HashMap<URL::URL, ModuleSpecifierMap>> sort_and_normalise_sc
}
// 4. Let normalizedScopePrefix be the serialization of scopePrefixURL.
auto normalised_scope_prefix = scope_prefix_url.serialize();
auto normalised_scope_prefix = scope_prefix_url->serialize();
// 5. Set normalized[normalizedScopePrefix] to the result of sorting and normalizing a module specifier map given potentialSpecifierMap and baseURL.
normalised.set(normalised_scope_prefix, TRY(sort_and_normalise_module_specifier_map(realm, potential_specifier_map.as_object(), base_url)));