mirrors/ladybird
0
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-05-05 18:52:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

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
Notes: sideshowbarker 2024-07-17 02:55:44 +09:00
14 changed files with 63 additions and 75 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Userland/Libraries/LibWeb/HTML/HTMLFormElement.cpp
View file

@ -616,7 +616,7 @@ ErrorOr<void> HTMLFormElement::mutate_action_url(AK::URL parsed_action, Vector<X
auto query = TRY(url_encode(pairs, encoding));
// 3. Set parsed action's query component to query.
parsed_action.set_query(query.to_deprecated_string());
parsed_action.set_query(query);
// 4. Plan to navigate to parsed action.
plan_to_navigate_to(move(parsed_action), target_navigable, history_handling);
@ -715,7 +715,7 @@ ErrorOr<void> HTMLFormElement::mail_with_headers(AK::URL parsed_action, Vector<X
TRY(headers.replace("+"sv, "%20"sv, ReplaceMode::All));
// 4. Set parsed action's query to headers.
parsed_action.set_query(headers.to_deprecated_string());
parsed_action.set_query(headers);
// 5. Plan to navigate to parsed action.
plan_to_navigate_to(move(parsed_action), target_navigable, history_handling);
@ -751,15 +751,15 @@ ErrorOr<void> HTMLFormElement::mail_as_body(AK::URL parsed_action, Vector<XHR::F
}
// 3. If parsed action's query is null, then set it to the empty string.
if (parsed_action.query().is_null())
parsed_action.set_query(DeprecatedString::empty());
if (!parsed_action.query().has_value())
parsed_action.set_query(String {});
StringBuilder query_builder;
TRY(query_builder.try_append(parsed_action.query()));
query_builder.append(*parsed_action.query());
// 4. If parsed action's query is not the empty string, then append a single U+0026 AMPERSAND character (&) to it.
if (!parsed_action.query().is_empty())
if (!parsed_action.query()->is_empty())
TRY(query_builder.try_append('&'));
// 5. Append "body=" to parsed action's query.
@ -768,7 +768,7 @@ ErrorOr<void> HTMLFormElement::mail_as_body(AK::URL parsed_action, Vector<XHR::F
// 6. Append body to parsed action's query.
TRY(query_builder.try_append(body));
parsed_action.set_query(query_builder.to_deprecated_string());
parsed_action.set_query(MUST(query_builder.to_string()));
// 7. Plan to navigate to parsed action.
plan_to_navigate_to(move(parsed_action), target_navigable, history_handling);