Stowage/ladybird
2
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-12-07 21:59:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

LibWeb: Don't mangle inherited properties when updating animated style

Browse source
This commit is contained in:
Callum Law 2025-11-19 00:04:20 +13:00 • committed by Jelle Raaijmakers
parent 01f6f33236
commit 408bbead31
Notes: github-actions[bot] 2025-11-21 08:25:55 +00:00
5 changed files with 39 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Libraries/LibWeb/Animations/KeyframeEffect.cpp
View file

@ -922,7 +922,7 @@ void KeyframeEffect::update_computed_properties(AnimationUpdateContext& context)
DOM::AbstractElement abstract_element { *target, pseudo_element_type() };
context.elements.ensure(abstract_element, [computed_properties] {
auto old_animated_properties = computed_properties->animated_property_values();
computed_properties->reset_animated_properties({});
computed_properties->reset_non_inherited_animated_properties({});
return make<AnimationUpdateContext::ElementData>(move(old_animated_properties), computed_properties);
});

7
Libraries/LibWeb/CSS/ComputedProperties.cpp
View file

@ -161,9 +161,12 @@ void ComputedProperties::remove_animated_property(PropertyID id)
m_animated_property_values.remove(id);
}
void ComputedProperties::reset_animated_properties(Badge<Animations::KeyframeEffect>)
void ComputedProperties::reset_non_inherited_animated_properties(Badge<Animations::KeyframeEffect>)
{
m_animated_property_values.clear();
for (auto property_id : m_animated_property_values.keys()) {
if (!is_animated_property_inherited(property_id))
m_animated_property_values.remove(property_id);
}
}
StyleValue const& ComputedProperties::property(PropertyID property_id, WithAnimationsApplied return_animated_value) const

2
Libraries/LibWeb/CSS/ComputedProperties.h
View file

@ -50,7 +50,7 @@ public:
};
HashMap<PropertyID, NonnullRefPtr<StyleValue const>> const& animated_property_values() const { return m_animated_property_values; }
void reset_animated_properties(Badge<Animations::KeyframeEffect>);
void reset_non_inherited_animated_properties(Badge<Animations::KeyframeEffect>);
bool is_property_important(PropertyID property_id) const;
bool is_property_inherited(PropertyID property_id) const;

1
Tests/LibWeb/Text/expected/css/animations-dont-mangle-inherited-animated-properties.txt Normal file
View file

@ -0,0 +1 @@
rgb(255, 0, 0)

31
Tests/LibWeb/Text/input/css/animations-dont-mangle-inherited-animated-properties.html Normal file
View file

@ -0,0 +1,31 @@
<!DOCTYPE html>
<style>
@keyframes foo {
from,
to {
color: red;
}
}
@keyframes bar {
from,
to {
width: 10px;
}
}
#foo {
animation: foo 1s infinite;
}
#bar {
animation: bar 1s infinite;
}
</style>
<div id="foo"><div id="bar"></div></div>
<script src="../include.js"></script>
<script>
test(() => {
println(getComputedStyle(bar).color);
});
</script>