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

LibHTML: Make CSS inheritance slightly less hacky

Browse source 
Add a simple is_inherited_property(name) lookup function and use that
to implement CSS property inheritance.

It's a bug that "text-decoration" is inherited, but we currently rely
on this in order to propagate e.g underline into linkified line boxes.
This commit is contained in:
Andreas Kling 2019-10-04 22:52:49 +02:00
parent 3feb452bf4
commit 77218b1c2a
1 changed files with 34 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

36
Libraries/LibHTML/CSS/StyleResolver.cpp
View file

@ -57,14 +57,46 @@ NonnullRefPtrVector<StyleRule> StyleResolver::collect_matching_rules(const Eleme
return matching_rules; return matching_rules;
} }
static bool is_inherited_property(const StringView& name)
{
static HashTable<String> inherited_properties;
if (inherited_properties.is_empty()) {
inherited_properties.set("border-collapse");
inherited_properties.set("border-spacing");
inherited_properties.set("color");
inherited_properties.set("font-family");
inherited_properties.set("font-size");
inherited_properties.set("font-style");
inherited_properties.set("font-variant");
inherited_properties.set("font-weight");
inherited_properties.set("font");
inherited_properties.set("letter-spacing");
inherited_properties.set("line-height");
inherited_properties.set("list-style-image");
inherited_properties.set("list-style-position");
inherited_properties.set("list-style-type");
inherited_properties.set("list-style");
inherited_properties.set("text-align");
inherited_properties.set("text-indent");
inherited_properties.set("text-transform");
inherited_properties.set("visibility");
inherited_properties.set("white-space");
inherited_properties.set("word-spacing");
// FIXME: This property is not supposed to be inherited, but we currently
// rely on inheritance to propagate decorations into line boxes.
inherited_properties.set("text-decoraton");
}
return inherited_properties.contains(name);
}
NonnullRefPtr<StyleProperties> StyleResolver::resolve_style(const Element& element, const StyleProperties* parent_properties) const NonnullRefPtr<StyleProperties> StyleResolver::resolve_style(const Element& element, const StyleProperties* parent_properties) const
{ {
auto style_properties = StyleProperties::create(); auto style_properties = StyleProperties::create();
if (parent_properties) { if (parent_properties) {
parent_properties->for_each_property([&](const StringView& name, auto& value) { parent_properties->for_each_property([&](const StringView& name, auto& value) {
// TODO: proper inheritance if (is_inherited_property(name))
if (name.starts_with("font") || name == "white-space" || name == "color" || name == "text-decoration")
style_properties->set_property(name, value); style_properties->set_property(name, value);
}); });
} }