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

LibWeb: Port ComputedValues to new Strings

Browse source
This commit is contained in:
Sam Atkins 2023-02-14 16:05:40 +00:00 • committed by Tim Flynn
parent 9e735cc02e
commit e338ef4914
3 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Userland/Libraries/LibWeb/CSS/ComputedValues.h
View file

@ -133,8 +133,8 @@ struct ContentData {
} type { Type::Normal }; } type { Type::Normal };
// FIXME: Data is a list of identifiers, strings and image values. // FIXME: Data is a list of identifiers, strings and image values.
DeprecatedString data {}; String data {};
DeprecatedString alt_text {}; String alt_text {};
}; };
struct BorderRadiusData { struct BorderRadiusData {

4
Userland/Libraries/LibWeb/CSS/StyleProperties.cpp
View file

@ -494,7 +494,7 @@ CSS::ContentData StyleProperties::content() const
} }
} }
content_data.type = ContentData::Type::String; content_data.type = ContentData::Type::String;
content_data.data = builder.to_deprecated_string(); content_data.data = builder.to_string().release_value_but_fixme_should_propagate_errors();
if (content_style_value.has_alt_text()) { if (content_style_value.has_alt_text()) {
StringBuilder alt_text_builder; StringBuilder alt_text_builder;
@ -505,7 +505,7 @@ CSS::ContentData StyleProperties::content() const
// TODO: Implement counters // TODO: Implement counters
} }
} }
content_data.alt_text = alt_text_builder.to_deprecated_string(); content_data.alt_text = alt_text_builder.to_string().release_value_but_fixme_should_propagate_errors();
} }
return content_data; return content_data;

2
Userland/Libraries/LibWeb/Layout/TreeBuilder.cpp
View file

@ -171,7 +171,7 @@ ErrorOr<void> TreeBuilder::create_pseudo_element_if_needed(DOM::Element& element
pseudo_element_node->set_generated(true); pseudo_element_node->set_generated(true);
// FIXME: Handle images, and multiple values // FIXME: Handle images, and multiple values
if (pseudo_element_content.type == CSS::ContentData::Type::String) { if (pseudo_element_content.type == CSS::ContentData::Type::String) {
auto text = document.heap().allocate<DOM::Text>(document.realm(), document, pseudo_element_content.data).release_allocated_value_but_fixme_should_propagate_errors(); auto text = document.heap().allocate<DOM::Text>(document.realm(), document, pseudo_element_content.data.to_deprecated_string()).release_allocated_value_but_fixme_should_propagate_errors();
auto text_node = document.heap().allocate_without_realm<Layout::TextNode>(document, *text); auto text_node = document.heap().allocate_without_realm<Layout::TextNode>(document, *text);
text_node->set_generated(true); text_node->set_generated(true);
push_parent(verify_cast<NodeWithStyle>(*pseudo_element_node)); push_parent(verify_cast<NodeWithStyle>(*pseudo_element_node));