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

LibWeb: Port Element::get_attribute_value from ByteString

Browse source
This commit is contained in:
Shannon Booth 2023-12-27 13:28:00 +13:00 • committed by Andreas Kling
parent 2751f32a18
commit 462f97b28a
3 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Userland/Libraries/LibWeb/CSS/Parser/Parser.cpp
View file

@ -75,6 +75,7 @@
#include <LibWeb/CSS/StyleValues/UnresolvedStyleValue.h> #include <LibWeb/CSS/StyleValues/UnresolvedStyleValue.h>
#include <LibWeb/CSS/StyleValues/UnsetStyleValue.h> #include <LibWeb/CSS/StyleValues/UnsetStyleValue.h>
#include <LibWeb/Dump.h> #include <LibWeb/Dump.h>
#include <LibWeb/Infra/CharacterTypes.h>
#include <LibWeb/Infra/Strings.h> #include <LibWeb/Infra/Strings.h>
static void log_parse_error(SourceLocation const& location = SourceLocation::current()) static void log_parse_error(SourceLocation const& location = SourceLocation::current())
@ -6976,11 +6977,11 @@ bool Parser::substitute_attr_function(DOM::Element& element, StringView property
// with leading and trailing ASCII whitespace stripped. (No CSS parsing of the value is performed.) // with leading and trailing ASCII whitespace stripped. (No CSS parsing of the value is performed.)
// If the attribute value, after trimming, is the empty string, there is instead no substitution value. // If the attribute value, after trimming, is the empty string, there is instead no substitution value.
// If the <custom-ident>’s value is a CSS-wide keyword or `default`, there is instead no substitution value. // If the <custom-ident>’s value is a CSS-wide keyword or `default`, there is instead no substitution value.
auto substitution_value = attribute_value.trim_whitespace(); auto substitution_value = MUST(attribute_value.trim(Infra::ASCII_WHITESPACE));
if (!substitution_value.is_empty() if (!substitution_value.is_empty()
&& !substitution_value.equals_ignoring_ascii_case("default"sv) && !substitution_value.equals_ignoring_ascii_case("default"sv)
&& !is_css_wide_keyword(substitution_value)) { && !is_css_wide_keyword(substitution_value)) {
dest.empend(Token::create_ident(MUST(FlyString::from_deprecated_fly_string(substitution_value)))); dest.empend(Token::create_ident(substitution_value));
return true; return true;
} }
} else if (attribute_type.equals_ignoring_ascii_case("length"_fly_string)) { } else if (attribute_type.equals_ignoring_ascii_case("length"_fly_string)) {
@ -7016,7 +7017,7 @@ bool Parser::substitute_attr_function(DOM::Element& element, StringView property
// The substitution value is a CSS string, whose value is the literal value of the attribute. // The substitution value is a CSS string, whose value is the literal value of the attribute.
// (No CSS parsing or "cleanup" of the value is performed.) // (No CSS parsing or "cleanup" of the value is performed.)
// No value triggers fallback. // No value triggers fallback.
dest.empend(Token::create_string(MUST(FlyString::from_deprecated_fly_string(attribute_value)))); dest.empend(Token::create_string(attribute_value));
return true; return true;
} else if (attribute_type.equals_ignoring_ascii_case("time"_fly_string)) { } else if (attribute_type.equals_ignoring_ascii_case("time"_fly_string)) {
// Parse a component value from the attribute’s value. // Parse a component value from the attribute’s value.
@ -7033,7 +7034,7 @@ bool Parser::substitute_attr_function(DOM::Element& element, StringView property
// The substitution value is a CSS <url> value, whose url is the literal value of the attribute. // The substitution value is a CSS <url> value, whose url is the literal value of the attribute.
// (No CSS parsing or "cleanup" of the value is performed.) // (No CSS parsing or "cleanup" of the value is performed.)
// No value triggers fallback. // No value triggers fallback.
dest.empend(Token::create_url(MUST(FlyString::from_deprecated_fly_string(attribute_value)))); dest.empend(Token::create_url(attribute_value));
return true; return true;
} else { } else {
// Dimension units // Dimension units

6
Userland/Libraries/LibWeb/DOM/Element.cpp
View file

@ -130,17 +130,17 @@ ByteString Element::deprecated_get_attribute(StringView name) const
} }
// https://dom.spec.whatwg.org/#concept-element-attributes-get-value // https://dom.spec.whatwg.org/#concept-element-attributes-get-value
ByteString Element::get_attribute_value(FlyString const& local_name, Optional<FlyString> const& namespace_) const String Element::get_attribute_value(FlyString const& local_name, Optional<FlyString> const& namespace_) const
{ {
// 1. Let attr be the result of getting an attribute given namespace, localName, and element. // 1. Let attr be the result of getting an attribute given namespace, localName, and element.
auto const* attribute = m_attributes->get_attribute_ns(namespace_, local_name); auto const* attribute = m_attributes->get_attribute_ns(namespace_, local_name);
// 2. If attr is null, then return the empty string. // 2. If attr is null, then return the empty string.
if (!attribute) if (!attribute)
return ByteString::empty(); return String {};
// 3. Return attr’s value. // 3. Return attr’s value.
return attribute->value().to_byte_string(); return attribute->value();
} }
// https://dom.spec.whatwg.org/#dom-element-getattributenode // https://dom.spec.whatwg.org/#dom-element-getattributenode

2
Userland/Libraries/LibWeb/DOM/Element.h
View file

@ -103,7 +103,7 @@ public:
// FIXME: This should be taking a 'FlyString const&' / 'Optional<FlyString> const&' // FIXME: This should be taking a 'FlyString const&' / 'Optional<FlyString> const&'
Optional<String> get_attribute(StringView name) const; Optional<String> get_attribute(StringView name) const;
ByteString deprecated_get_attribute(StringView name) const; ByteString deprecated_get_attribute(StringView name) const;
ByteString get_attribute_value(FlyString const& local_name, Optional<FlyString> const& namespace_ = {}) const; String get_attribute_value(FlyString const& local_name, Optional<FlyString> const& namespace_ = {}) const;
WebIDL::ExceptionOr<void> set_attribute(FlyString const& name, String const& value); WebIDL::ExceptionOr<void> set_attribute(FlyString const& name, String const& value);