mirror of
https://github.com/RGBCube/serenity
synced 2025-07-26 22:17:43 +00:00
LibWeb: Resolve custom properties
The way to get the custom properties is pretty weird and this code is as far from optimized as it gets but somehow it works :^)
This commit is contained in:
parent
bf9c5ffb3f
commit
fd6b04055c
2 changed files with 48 additions and 1 deletions
|
@ -765,6 +765,37 @@ static void set_property_expanding_shorthands(StyleProperties& style, CSS::Prope
|
||||||
style.set_property(property_id, value);
|
style.set_property(property_id, value);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
StyleResolver::CustomPropertyResolutionTuple StyleResolver::resolve_custom_property_with_specificity(const DOM::Element& element, const String& custom_property_name) const
|
||||||
|
{
|
||||||
|
auto parent_element = element.parent_element();
|
||||||
|
CustomPropertyResolutionTuple parent_resolved {};
|
||||||
|
if (parent_element)
|
||||||
|
parent_resolved = resolve_custom_property_with_specificity(*parent_element, custom_property_name);
|
||||||
|
|
||||||
|
auto matching_rules = collect_matching_rules(element);
|
||||||
|
sort_matching_rules(matching_rules);
|
||||||
|
|
||||||
|
for (int i = matching_rules.size() - 1; i >= 0; --i) {
|
||||||
|
auto& match = matching_rules[i];
|
||||||
|
if (match.specificity < parent_resolved.specificity)
|
||||||
|
continue;
|
||||||
|
|
||||||
|
auto custom_property_style = match.rule->declaration().custom_property(custom_property_name);
|
||||||
|
if (custom_property_style.has_value()) {
|
||||||
|
return { custom_property_style.value(), match.specificity };
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return parent_resolved;
|
||||||
|
}
|
||||||
|
|
||||||
|
Optional<StyleProperty> StyleResolver::resolve_custom_property(const DOM::Element& element, const String& custom_property_name) const
|
||||||
|
{
|
||||||
|
auto resolved_with_specificity = resolve_custom_property_with_specificity(element, custom_property_name);
|
||||||
|
|
||||||
|
return resolved_with_specificity.style;
|
||||||
|
}
|
||||||
|
|
||||||
NonnullRefPtr<StyleProperties> StyleResolver::resolve_style(const DOM::Element& element) const
|
NonnullRefPtr<StyleProperties> StyleResolver::resolve_style(const DOM::Element& element) const
|
||||||
{
|
{
|
||||||
auto style = StyleProperties::create();
|
auto style = StyleProperties::create();
|
||||||
|
@ -783,7 +814,16 @@ NonnullRefPtr<StyleProperties> StyleResolver::resolve_style(const DOM::Element&
|
||||||
|
|
||||||
for (auto& match : matching_rules) {
|
for (auto& match : matching_rules) {
|
||||||
for (auto& property : match.rule->declaration().properties()) {
|
for (auto& property : match.rule->declaration().properties()) {
|
||||||
set_property_expanding_shorthands(style, property.property_id, property.value, m_document);
|
auto property_value = property.value;
|
||||||
|
if (property.value->is_custom_property()) {
|
||||||
|
auto prop = reinterpret_cast<const CSS::CustomStyleValue*>(property.value.ptr());
|
||||||
|
auto custom_prop_name = prop->custom_property_name();
|
||||||
|
auto resolved = resolve_custom_property(element, custom_prop_name);
|
||||||
|
if (resolved.has_value()) {
|
||||||
|
property_value = resolved.value().value;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
set_property_expanding_shorthands(style, property.property_id, property_value, m_document);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -8,6 +8,7 @@
|
||||||
|
|
||||||
#include <AK/NonnullRefPtrVector.h>
|
#include <AK/NonnullRefPtrVector.h>
|
||||||
#include <AK/OwnPtr.h>
|
#include <AK/OwnPtr.h>
|
||||||
|
#include <LibWeb/CSS/CSSStyleDeclaration.h>
|
||||||
#include <LibWeb/CSS/StyleProperties.h>
|
#include <LibWeb/CSS/StyleProperties.h>
|
||||||
#include <LibWeb/Forward.h>
|
#include <LibWeb/Forward.h>
|
||||||
|
|
||||||
|
@ -33,6 +34,12 @@ public:
|
||||||
|
|
||||||
Vector<MatchingRule> collect_matching_rules(const DOM::Element&) const;
|
Vector<MatchingRule> collect_matching_rules(const DOM::Element&) const;
|
||||||
void sort_matching_rules(Vector<MatchingRule>&) const;
|
void sort_matching_rules(Vector<MatchingRule>&) const;
|
||||||
|
struct CustomPropertyResolutionTuple {
|
||||||
|
Optional<StyleProperty> style {};
|
||||||
|
u32 specificity { 0 };
|
||||||
|
};
|
||||||
|
CustomPropertyResolutionTuple resolve_custom_property_with_specificity(const DOM::Element&, const String&) const;
|
||||||
|
Optional<StyleProperty> resolve_custom_property(const DOM::Element&, const String&) const;
|
||||||
|
|
||||||
static bool is_inherited_property(CSS::PropertyID);
|
static bool is_inherited_property(CSS::PropertyID);
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue