From fabea2a6a767d4108905ec3482524e47daae6988 Mon Sep 17 00:00:00 2001 From: Linus Groh Date: Fri, 3 Mar 2023 09:27:50 +0000 Subject: [PATCH] LibWeb/MimeSniff: Rename MimeType::from_string() to MimeType::parse() This matches the spec's "parse a MIME type". --- .../Libraries/LibWeb/Fetch/Infrastructure/HTTP/Headers.cpp | 4 ++-- Userland/Libraries/LibWeb/HTML/HTMLObjectElement.cpp | 2 +- Userland/Libraries/LibWeb/MimeSniff/MimeType.cpp | 4 ++-- Userland/Libraries/LibWeb/MimeSniff/MimeType.h | 2 +- Userland/Libraries/LibWeb/XHR/XMLHttpRequest.cpp | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Userland/Libraries/LibWeb/Fetch/Infrastructure/HTTP/Headers.cpp b/Userland/Libraries/LibWeb/Fetch/Infrastructure/HTTP/Headers.cpp index d80844d520..0c79d7ff93 100644 --- a/Userland/Libraries/LibWeb/Fetch/Infrastructure/HTTP/Headers.cpp +++ b/Userland/Libraries/LibWeb/Fetch/Infrastructure/HTTP/Headers.cpp @@ -322,7 +322,7 @@ Optional HeaderList::extract_mime_type() const // 6. For each value of values: for (auto const& value : *values) { // 1. Let temporaryMimeType be the result of parsing value. - auto temporary_mime_type = MimeSniff::MimeType::from_string(value); + auto temporary_mime_type = MimeSniff::MimeType::parse(value); // 2. If temporaryMimeType is failure or its essence is "*/*", then continue. if (!temporary_mime_type.has_value() || temporary_mime_type->essence() == "*/*"sv) @@ -457,7 +457,7 @@ bool is_cors_safelisted_request_header(Header const& header) return false; // 2. Let mimeType be the result of parsing the result of isomorphic decoding value. - auto mime_type = MimeSniff::MimeType::from_string(StringView { value }); + auto mime_type = MimeSniff::MimeType::parse(StringView { value }); // 3. If mimeType is failure, then return false. if (!mime_type.has_value()) diff --git a/Userland/Libraries/LibWeb/HTML/HTMLObjectElement.cpp b/Userland/Libraries/LibWeb/HTML/HTMLObjectElement.cpp index 5997b98ec9..de0a3409f1 100644 --- a/Userland/Libraries/LibWeb/HTML/HTMLObjectElement.cpp +++ b/Userland/Libraries/LibWeb/HTML/HTMLObjectElement.cpp @@ -218,7 +218,7 @@ void HTMLObjectElement::resource_did_load() static bool is_xml_mime_type(StringView resource_type) { - auto mime_type = MimeSniff::MimeType::from_string(resource_type); + auto mime_type = MimeSniff::MimeType::parse(resource_type); if (!mime_type.has_value()) return false; diff --git a/Userland/Libraries/LibWeb/MimeSniff/MimeType.cpp b/Userland/Libraries/LibWeb/MimeSniff/MimeType.cpp index 2f15b8f5d1..95121812df 100644 --- a/Userland/Libraries/LibWeb/MimeSniff/MimeType.cpp +++ b/Userland/Libraries/LibWeb/MimeSniff/MimeType.cpp @@ -19,7 +19,7 @@ namespace Web::MimeSniff { bool is_javascript_mime_type_essence_match(DeprecatedString const& string) { // NOTE: The mime type parser automatically lowercases the essence. - auto type = MimeType::from_string(string); + auto type = MimeType::parse(string); if (!type.has_value()) return false; return type->is_javascript(); @@ -64,7 +64,7 @@ static bool contains_only_http_token_code_points(StringView string) } // https://mimesniff.spec.whatwg.org/#parse-a-mime-type -Optional MimeType::from_string(StringView string) +Optional MimeType::parse(StringView string) { // 1. Remove any leading and trailing HTTP whitespace from input. auto trimmed_string = string.trim(Fetch::Infrastructure::HTTP_WHITESPACE, TrimMode::Both); diff --git a/Userland/Libraries/LibWeb/MimeSniff/MimeType.h b/Userland/Libraries/LibWeb/MimeSniff/MimeType.h index 9163c4e2a5..ef872cdd4b 100644 --- a/Userland/Libraries/LibWeb/MimeSniff/MimeType.h +++ b/Userland/Libraries/LibWeb/MimeSniff/MimeType.h @@ -17,7 +17,7 @@ bool is_javascript_mime_type_essence_match(DeprecatedString const&); // https://mimesniff.spec.whatwg.org/#mime-type class MimeType { public: - static Optional from_string(StringView); + static Optional parse(StringView); MimeType(DeprecatedString type, DeprecatedString subtype); ~MimeType(); diff --git a/Userland/Libraries/LibWeb/XHR/XMLHttpRequest.cpp b/Userland/Libraries/LibWeb/XHR/XMLHttpRequest.cpp index fc50bb99d5..7f3d48edcf 100644 --- a/Userland/Libraries/LibWeb/XHR/XMLHttpRequest.cpp +++ b/Userland/Libraries/LibWeb/XHR/XMLHttpRequest.cpp @@ -610,7 +610,7 @@ WebIDL::ExceptionOr XMLHttpRequest::override_mime_type(DeprecatedString co return WebIDL::InvalidStateError::create(realm(), "Cannot override MIME type when state is Loading or Done."); // 2. Set this’s override MIME type to the result of parsing mime. - m_override_mime_type = MimeSniff::MimeType::from_string(mime); + m_override_mime_type = MimeSniff::MimeType::parse(mime); // 3. If this’s override MIME type is failure, then set this’s override MIME type to application/octet-stream. if (!m_override_mime_type.has_value())