mirrors/ladybird
0
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-07-29 20:29:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

LibWeb: Make MimeSniff::MimeType::parse() infallible

Browse source 
It already returns an empty Optional for failures, so there's no need to
wrap it in an ErrorOr as well.
This commit is contained in:
Andreas Kling 2024-10-14 11:18:44 +02:00 • committed by Andreas Kling
commit 5c20bc2afc
Notes: github-actions[bot] 2024-10-14 18:48:45 +00:00
15 changed files with 39 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -204,7 +204,7 @@ JS::NonnullGCPtr<Blob> Blob::create(JS::Realm& realm, Optional<Vector<BlobPart>>
// NOTE: The spec is out of date, and we are supposed to call into the MimeType parser here.
if (!options->type.is_empty()) {
auto maybe_parsed_type = MUST(Web::MimeSniff::MimeType::parse(options->type));
auto maybe_parsed_type = Web::MimeSniff::MimeType::parse(options->type);
if (maybe_parsed_type.has_value())
type = maybe_parsed_type->serialized();

2
Userland/Libraries/LibWeb/FileAPI/File.cpp
View file

@ -62,7 +62,7 @@ WebIDL::ExceptionOr<JS::NonnullGCPtr<File>> File::create(JS::Realm& realm, Vecto
// FIXME: 2. Convert every character in t to ASCII lowercase.
// NOTE: The spec is out of date, and we are supposed to call into the MimeType parser here.
auto maybe_parsed_type = MUST(Web::MimeSniff::MimeType::parse(options->type));
auto maybe_parsed_type = Web::MimeSniff::MimeType::parse(options->type);
if (maybe_parsed_type.has_value())
type = maybe_parsed_type->serialized();

4
Userland/Libraries/LibWeb/FileAPI/FileReader.cpp
View file

@ -86,8 +86,8 @@ WebIDL::ExceptionOr<FileReader::Result> FileReader::blob_package_data(JS::Realm&
auto maybe_type = MimeSniff::MimeType::parse(mime_type.value());
// 2. If type is not failure, set encoding to the result of getting an encoding from type’s parameters["charset"].
if (!maybe_type.is_error() && maybe_type.value().has_value()) {
auto type = maybe_type.release_value().value();
if (maybe_type.has_value()) {
auto const& type = maybe_type.value();
auto it = type.parameters().find("charset"sv);
if (it != type.parameters().end())
encoding = TextCodec::get_standardized_encoding(it->value);