mirror of
https://github.com/LadybirdBrowser/ladybird.git
synced 2025-12-07 21:59:54 +00:00
LibWeb: Extract transition coordination logic to reusable method
This will be useful for other coordinating list property groups (e.g. background and animation)
This commit is contained in:
parent
e78cb71eb3
commit
fc5cdd69a0
Notes:
github-actions[bot]
2025-10-23 09:11:30 +00:00
Author: https://github.com/Calme1709
Commit: fc5cdd69a0
Pull-request: https://github.com/LadybirdBrowser/ladybird/pull/6508
Reviewed-by: https://github.com/AtkinsSJ ✅
4 changed files with 50 additions and 42 deletions
|
|
@ -312,6 +312,43 @@ Color ComputedProperties::color_or_fallback(PropertyID id, ColorResolutionContex
|
||||||
return value.to_color(color_resolution_context).value();
|
return value.to_color(color_resolution_context).value();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// https://drafts.csswg.org/css-values-4/#linked-properties
|
||||||
|
HashMap<PropertyID, StyleValueVector> ComputedProperties::assemble_coordinated_value_list(PropertyID base_property_id, Vector<PropertyID> const& property_ids) const
|
||||||
|
{
|
||||||
|
// A coordinating list property group creates a coordinated value list, which has, for each entry, a value from each
|
||||||
|
// property in the group; these are used together to define a single effect, such as a background image layer or an
|
||||||
|
// animation. The coordinated value list is assembled as follows:
|
||||||
|
// - The length of the coordinated value list is determined by the number of items specified in one particular
|
||||||
|
// coordinating list property, the coordinating list base property. (In the case of backgrounds, this is the
|
||||||
|
// background-image property.)
|
||||||
|
// - The Nth value of the coordinated value list is constructed by collecting the Nth use value of each coordinating
|
||||||
|
// list property
|
||||||
|
// - If a coordinating list property has too many values specified, excess values at the end of its list are not
|
||||||
|
// used.
|
||||||
|
// - If a coordinating list property has too few values specified, its value list is repeated to add more used
|
||||||
|
// values.
|
||||||
|
// - The computed values of the coordinating list properties are not affected by such truncation or repetition.
|
||||||
|
|
||||||
|
// FIXME: This is only required until we update parse_comma_separated_list to always return a StyleValueList
|
||||||
|
auto const get_property_value_as_list = [&](PropertyID property_id) {
|
||||||
|
auto const& value = property(property_id);
|
||||||
|
|
||||||
|
return value.is_value_list() ? value.as_value_list().values() : StyleValueVector { value };
|
||||||
|
};
|
||||||
|
|
||||||
|
HashMap<PropertyID, StyleValueVector> coordinated_value_list;
|
||||||
|
|
||||||
|
for (size_t i = 0; i < get_property_value_as_list(base_property_id).size(); i++) {
|
||||||
|
for (auto property_id : property_ids) {
|
||||||
|
auto const& list = get_property_value_as_list(property_id);
|
||||||
|
|
||||||
|
coordinated_value_list.ensure(property_id).append(list[i % list.size()]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return coordinated_value_list;
|
||||||
|
}
|
||||||
|
|
||||||
ColorInterpolation ComputedProperties::color_interpolation() const
|
ColorInterpolation ComputedProperties::color_interpolation() const
|
||||||
{
|
{
|
||||||
auto const& value = property(PropertyID::ColorInterpolation);
|
auto const& value = property(PropertyID::ColorInterpolation);
|
||||||
|
|
|
||||||
|
|
@ -84,6 +84,7 @@ public:
|
||||||
Optional<LengthPercentage> length_percentage(PropertyID, Layout::NodeWithStyle const&, ClampNegativeLengths) const;
|
Optional<LengthPercentage> length_percentage(PropertyID, Layout::NodeWithStyle const&, ClampNegativeLengths) const;
|
||||||
LengthBox length_box(PropertyID left_id, PropertyID top_id, PropertyID right_id, PropertyID bottom_id, Layout::NodeWithStyle const&, ClampNegativeLengths, LengthPercentageOrAuto const& default_value) const;
|
LengthBox length_box(PropertyID left_id, PropertyID top_id, PropertyID right_id, PropertyID bottom_id, Layout::NodeWithStyle const&, ClampNegativeLengths, LengthPercentageOrAuto const& default_value) const;
|
||||||
Color color_or_fallback(PropertyID, ColorResolutionContext, Color fallback) const;
|
Color color_or_fallback(PropertyID, ColorResolutionContext, Color fallback) const;
|
||||||
|
HashMap<PropertyID, StyleValueVector> assemble_coordinated_value_list(PropertyID base_property_id, Vector<PropertyID> const& property_ids) const;
|
||||||
ColorInterpolation color_interpolation() const;
|
ColorInterpolation color_interpolation() const;
|
||||||
PreferredColorScheme color_scheme(PreferredColorScheme, Optional<Vector<String> const&> document_supported_schemes) const;
|
PreferredColorScheme color_scheme(PreferredColorScheme, Optional<Vector<String> const&> document_supported_schemes) const;
|
||||||
TextAnchor text_anchor() const;
|
TextAnchor text_anchor() const;
|
||||||
|
|
|
||||||
|
|
@ -1351,11 +1351,11 @@ static void compute_transitioned_properties(ComputedProperties const& style, DOM
|
||||||
element.clear_transitions(pseudo_element);
|
element.clear_transitions(pseudo_element);
|
||||||
element.set_cached_transition_property_source(pseudo_element, *source_declaration);
|
element.set_cached_transition_property_source(pseudo_element, *source_declaration);
|
||||||
|
|
||||||
auto const& transition_properties_value = style.property(PropertyID::TransitionProperty);
|
auto coordinated_transition_list = style.assemble_coordinated_value_list(
|
||||||
auto transition_properties = transition_properties_value.is_value_list()
|
PropertyID::TransitionProperty,
|
||||||
? transition_properties_value.as_value_list().values()
|
{ PropertyID::TransitionProperty, PropertyID::TransitionDuration, PropertyID::TransitionTimingFunction, PropertyID::TransitionDelay, PropertyID::TransitionBehavior });
|
||||||
: StyleValueVector { transition_properties_value };
|
|
||||||
|
|
||||||
|
auto transition_properties = coordinated_transition_list.get(PropertyID::TransitionProperty).value();
|
||||||
Vector<Vector<PropertyID>> properties;
|
Vector<Vector<PropertyID>> properties;
|
||||||
|
|
||||||
for (size_t i = 0; i < transition_properties.size(); i++) {
|
for (size_t i = 0; i < transition_properties.size(); i++) {
|
||||||
|
|
@ -1396,44 +1396,13 @@ static void compute_transitioned_properties(ComputedProperties const& style, DOM
|
||||||
properties.append(move(properties_for_this_transition));
|
properties.append(move(properties_for_this_transition));
|
||||||
}
|
}
|
||||||
|
|
||||||
auto normalize_transition_length_list = [&properties, &style](PropertyID property, auto make_default_value) {
|
element.add_transitioned_properties(
|
||||||
auto const& style_value = style.property(property);
|
pseudo_element,
|
||||||
StyleValueVector list;
|
move(properties),
|
||||||
|
move(coordinated_transition_list.get(PropertyID::TransitionDelay).value()),
|
||||||
if (!style_value.is_value_list()) {
|
move(coordinated_transition_list.get(PropertyID::TransitionDuration).value()),
|
||||||
for (size_t i = 0; i < properties.size(); i++)
|
move(coordinated_transition_list.get(PropertyID::TransitionTimingFunction).value()),
|
||||||
list.append(style_value);
|
move(coordinated_transition_list.get(PropertyID::TransitionBehavior).value()));
|
||||||
return list;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (style_value.as_value_list().size() == 0) {
|
|
||||||
auto default_value = make_default_value();
|
|
||||||
for (size_t i = 0; i < properties.size(); i++)
|
|
||||||
list.append(default_value);
|
|
||||||
return list;
|
|
||||||
}
|
|
||||||
|
|
||||||
auto const& value_list = style_value.as_value_list();
|
|
||||||
for (size_t i = 0; i < properties.size(); i++)
|
|
||||||
list.append(value_list.value_at(i, true));
|
|
||||||
|
|
||||||
return list;
|
|
||||||
};
|
|
||||||
|
|
||||||
auto delays = normalize_transition_length_list(
|
|
||||||
PropertyID::TransitionDelay,
|
|
||||||
[] { return TimeStyleValue::create(Time::make_seconds(0.0)); });
|
|
||||||
auto durations = normalize_transition_length_list(
|
|
||||||
PropertyID::TransitionDuration,
|
|
||||||
[] { return TimeStyleValue::create(Time::make_seconds(0.0)); });
|
|
||||||
auto timing_functions = normalize_transition_length_list(
|
|
||||||
PropertyID::TransitionTimingFunction,
|
|
||||||
[] { return KeywordStyleValue::create(Keyword::Ease); });
|
|
||||||
auto transition_behaviors = normalize_transition_length_list(
|
|
||||||
PropertyID::TransitionBehavior,
|
|
||||||
[] { return KeywordStyleValue::create(Keyword::None); });
|
|
||||||
|
|
||||||
element.add_transitioned_properties(pseudo_element, move(properties), move(delays), move(durations), move(timing_functions), move(transition_behaviors));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// https://drafts.csswg.org/css-transitions/#starting
|
// https://drafts.csswg.org/css-transitions/#starting
|
||||||
|
|
|
||||||
|
|
@ -392,6 +392,7 @@ void NodeWithStyle::apply_style(CSS::ComputedProperties const& computed_style)
|
||||||
computed_values.set_vertical_align(computed_style.vertical_align());
|
computed_values.set_vertical_align(computed_style.vertical_align());
|
||||||
|
|
||||||
{
|
{
|
||||||
|
// FIXME: Use `ComputedProperties::assemble_coordinated_value_list()` for this
|
||||||
auto const& attachments = computed_style.property(CSS::PropertyID::BackgroundAttachment);
|
auto const& attachments = computed_style.property(CSS::PropertyID::BackgroundAttachment);
|
||||||
auto const& clips = computed_style.property(CSS::PropertyID::BackgroundClip);
|
auto const& clips = computed_style.property(CSS::PropertyID::BackgroundClip);
|
||||||
auto const& images = computed_style.property(CSS::PropertyID::BackgroundImage);
|
auto const& images = computed_style.property(CSS::PropertyID::BackgroundImage);
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue