RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-14 09:34:59 +00:00
Code Issues Activity Actions

AK: Port URL::m_query from DeprecatedString to String

Browse source
This commit is contained in:
Shannon Booth 2023-08-12 19:28:19 +12:00 • committed by Andrew Kaster
parent 55a01e72ca
commit 21fe86d235
14 changed files with 63 additions and 75 deletions
Download patch file Download diff file Expand all files Collapse all files

18
AK/URL.cpp
View file

@ -62,11 +62,6 @@ DeprecatedString URL::basename() const
return percent_decode(last_segment);
}
DeprecatedString URL::query() const
{
return m_query;
}
DeprecatedString URL::fragment() const
{
return percent_decode(m_fragment);
@ -145,11 +140,6 @@ void URL::append_path(StringView path)
m_paths.append(deprecated_string_percent_encode(path, PercentEncodeSet::Path));
}
void URL::set_query(StringView query)
{
m_query = deprecated_string_percent_encode(query, is_special() ? PercentEncodeSet::SpecialQuery : PercentEncodeSet::Query);
}
void URL::set_fragment(StringView fragment)
{
m_fragment = deprecated_string_percent_encode(fragment, PercentEncodeSet::Fragment);
@ -346,9 +336,9 @@ DeprecatedString URL::serialize(ExcludeFragment exclude_fragment) const
}
// 5. If url’s query is non-null, append U+003F (?), followed by url’s query, to output.
if (!m_query.is_null()) {
if (m_query.has_value()) {
output.append('?');
output.append(m_query);
output.append(*m_query);
}
// 6. If exclude fragment is false and url’s fragment is non-null, then append U+0023 (#), followed by url’s fragment, to output.
@ -391,9 +381,9 @@ DeprecatedString URL::serialize_for_display() const
}
}
if (!m_query.is_null()) {
if (m_query.has_value()) {
builder.append('?');
builder.append(m_query);
builder.append(*m_query);
}
if (!m_fragment.is_null()) {