RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 10:37:45 +00:00
Code Issues Activity Actions

LibWeb: Move Fetch infra into the Web::Fetch::Infrastructure namespace

Browse source 
The Fetch spec unfortunately will cause a name clash between the Request
concept and the Request JS object - both cannot live in the Web::Fetch
namespace, and WrapperGenerator generally assumes `Web::<Name>` for
things living in the `<Name>/` subdirectory, so let's instead move infra
code into its own namespace - it already sits in a (sub-)subdirectory
anyway.
This commit is contained in:
Linus Groh 2022-07-17 23:52:02 +01:00
parent 4b415a23c1
commit 2726fc9c73
20 changed files with 41 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Userland/Libraries/LibWeb/MimeSniff/MimeType.cpp
View file

@ -54,7 +54,7 @@ static bool contains_only_http_token_code_points(StringView string)
Optional<MimeType> MimeType::from_string(StringView string)
{
// 1. Remove any leading and trailing HTTP whitespace from input.
auto trimmed_string = string.trim(Fetch::HTTP_WHITESPACE, TrimMode::Both);
auto trimmed_string = string.trim(Fetch::Infrastructure::HTTP_WHITESPACE, TrimMode::Both);
// 2. Let position be a position variable for input, initially pointing at the start of input.
GenericLexer lexer(trimmed_string);
@ -77,7 +77,7 @@ Optional<MimeType> MimeType::from_string(StringView string)
auto subtype = lexer.consume_until(';');
// 8. Remove any trailing HTTP whitespace from subtype.
subtype = subtype.trim(Fetch::HTTP_WHITESPACE, TrimMode::Right);
subtype = subtype.trim(Fetch::Infrastructure::HTTP_WHITESPACE, TrimMode::Right);
// 9. If subtype is the empty string or does not solely contain HTTP token code points, then return failure.
if (subtype.is_empty() || !contains_only_http_token_code_points(subtype))
@ -92,7 +92,7 @@ Optional<MimeType> MimeType::from_string(StringView string)
lexer.ignore(1);
// 2. Collect a sequence of code points that are HTTP whitespace from input given position.
lexer.ignore_while(is_any_of(Fetch::HTTP_WHITESPACE));
lexer.ignore_while(is_any_of(Fetch::Infrastructure::HTTP_WHITESPACE));
// 3. Let parameterName be the result of collecting a sequence of code points that are not U+003B (;) or U+003D (=) from input, given position.
auto parameter_name = lexer.consume_until([](char ch) {
@ -124,7 +124,7 @@ Optional<MimeType> MimeType::from_string(StringView string)
// 8. If the code point at position within input is U+0022 ("), then:
if (lexer.peek() == '"') {
// 1. Set parameterValue to the result of collecting an HTTP quoted string from input, given position and the extract-value flag.
parameter_value = Fetch::collect_an_http_quoted_string(lexer, Fetch::HttpQuotedStringExtractValue::Yes);
parameter_value = Fetch::Infrastructure::collect_an_http_quoted_string(lexer, Fetch::Infrastructure::HttpQuotedStringExtractValue::Yes);
// 2. Collect a sequence of code points that are not U+003B (;) from input, given position.
// NOTE: This uses the predicate version as the ignore_until(char) version will also ignore the ';'.
@ -139,7 +139,7 @@ Optional<MimeType> MimeType::from_string(StringView string)
parameter_value = lexer.consume_until(';');
// 2. Remove any trailing HTTP whitespace from parameterValue.
parameter_value = parameter_value.trim(Fetch::HTTP_WHITESPACE, TrimMode::Right);
parameter_value = parameter_value.trim(Fetch::Infrastructure::HTTP_WHITESPACE, TrimMode::Right);
// 3. If parameterValue is the empty string, then continue.
if (parameter_value.is_empty())