mirror of
https://github.com/LadybirdBrowser/ladybird.git
synced 2025-05-01 16:58:52 +00:00
AK+Everywhere: Remove the null state of DeprecatedString
This commit removes DeprecatedString's "null" state, and replaces all its users with one of the following: - A normal, empty DeprecatedString - Optional<DeprecatedString> Note that null states of DeprecatedFlyString/StringView/etc are *not* affected by this commit. However, DeprecatedString::empty() is now considered equal to a null StringView.
This commit is contained in:
parent
daf6d8173c
commit
aeee98b3a1
Notes:
sideshowbarker
2024-07-16 20:21:48 +09:00
Author: https://github.com/alimpfard
Commit: aeee98b3a1
Pull-request: https://github.com/SerenityOS/serenity/pull/21397
Reviewed-by: https://github.com/shannonbooth
Reviewed-by: https://github.com/trflynn89
189 changed files with 597 additions and 652 deletions
|
@ -29,14 +29,14 @@ void HTMLHyperlinkElementUtils::set_the_url()
|
|||
{
|
||||
// 1. If this element's href content attribute is absent, set this element's url to null.
|
||||
auto href_content_attribute = hyperlink_element_utils_href();
|
||||
if (href_content_attribute.is_null()) {
|
||||
if (!href_content_attribute.has_value()) {
|
||||
m_url = {};
|
||||
return;
|
||||
}
|
||||
|
||||
// 2. Otherwise, parse this element's href content attribute value relative to this element's node document.
|
||||
// If parsing is successful, set this element's url to the result; otherwise, set this element's url to null.
|
||||
m_url = hyperlink_element_utils_document().parse_url(href_content_attribute);
|
||||
m_url = hyperlink_element_utils_document().parse_url(*href_content_attribute);
|
||||
}
|
||||
|
||||
// https://html.spec.whatwg.org/multipage/links.html#dom-hyperlink-origin
|
||||
|
@ -429,12 +429,12 @@ DeprecatedString HTMLHyperlinkElementUtils::href() const
|
|||
|
||||
// 3. If url is null and this element has no href content attribute, return the empty string.
|
||||
auto href_content_attribute = hyperlink_element_utils_href();
|
||||
if (!url.has_value() && href_content_attribute.is_null())
|
||||
if (!url.has_value() && !href_content_attribute.has_value())
|
||||
return DeprecatedString::empty();
|
||||
|
||||
// 4. Otherwise, if url is null, return this element's href content attribute's value.
|
||||
if (!url->is_valid())
|
||||
return href_content_attribute;
|
||||
return href_content_attribute->to_deprecated_string();
|
||||
|
||||
// 5. Return url, serialized.
|
||||
return url->serialize();
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue