From e8fe35b1e5bccdbac61d81a8696cb466c9796883 Mon Sep 17 00:00:00 2001 From: Karol Kosek Date: Thu, 30 Mar 2023 23:26:28 +0200 Subject: [PATCH] LibWeb: Resolve more background-related properties This change adds rules for background-attachment, background-clip, background-image, background-origin, and background-repeat. As a result, Window.getComputedStyle() will no longer return empty strings on these properties after a page is loaded, and the background shorthand will show the resolved values instead of the default ones for these values. :^) --- .../CSS/ResolvedCSSStyleDeclaration.cpp | 48 +++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/Userland/Libraries/LibWeb/CSS/ResolvedCSSStyleDeclaration.cpp b/Userland/Libraries/LibWeb/CSS/ResolvedCSSStyleDeclaration.cpp index 76cef8fcb6..93bce087e3 100644 --- a/Userland/Libraries/LibWeb/CSS/ResolvedCSSStyleDeclaration.cpp +++ b/Userland/Libraries/LibWeb/CSS/ResolvedCSSStyleDeclaration.cpp @@ -70,6 +70,19 @@ DeprecatedString ResolvedCSSStyleDeclaration::item(size_t index) const return {}; } +static NonnullRefPtr style_value_for_background_property(Layout::NodeWithStyle const& layout_node, Function(BackgroundLayerData const&)> callback, Function()> default_value) +{ + auto const& background_layers = layout_node.background_layers(); + if (background_layers.is_empty()) + return default_value(); + if (background_layers.size() == 1) + return callback(background_layers.first()); + StyleValueVector values; + for (auto const& layer : background_layers) + values.append(callback(layer)); + return StyleValueList::create(move(values), StyleValueList::Separator::Comma); +} + static RefPtr style_value_for_display(CSS::Display display) { if (display.is_none()) @@ -203,8 +216,43 @@ RefPtr ResolvedCSSStyleDeclaration::style_value_for_property(L value_or_default(maybe_background_origin, IdentifierStyleValue::create(CSS::ValueID::PaddingBox)), value_or_default(maybe_background_clip, IdentifierStyleValue::create(CSS::ValueID::BorderBox))); } + case CSS::PropertyID::BackgroundAttachment: + return style_value_for_background_property( + layout_node, + [](auto& layer) { return IdentifierStyleValue::create(to_value_id(layer.attachment)); }, + [] { return IdentifierStyleValue::create(CSS::ValueID::Scroll); }); + case CSS::PropertyID::BackgroundClip: + return style_value_for_background_property( + layout_node, + [](auto& layer) { return IdentifierStyleValue::create(to_value_id(layer.clip)); }, + [] { return IdentifierStyleValue::create(CSS::ValueID::BorderBox); }); case PropertyID::BackgroundColor: return ColorStyleValue::create(layout_node.computed_values().background_color()); + case CSS::PropertyID::BackgroundImage: + return style_value_for_background_property( + layout_node, + [](auto& layer) -> NonnullRefPtr { + if (layer.background_image) + return *layer.background_image; + return IdentifierStyleValue::create(CSS::ValueID::None); + }, + [] { return IdentifierStyleValue::create(CSS::ValueID::None); }); + case CSS::PropertyID::BackgroundOrigin: + return style_value_for_background_property( + layout_node, + [](auto& layer) { return IdentifierStyleValue::create(to_value_id(layer.origin)); }, + [] { return IdentifierStyleValue::create(CSS::ValueID::PaddingBox); }); + case CSS::PropertyID::BackgroundRepeat: + return style_value_for_background_property( + layout_node, + [](auto& layer) { + StyleValueVector repeat { + IdentifierStyleValue::create(to_value_id(layer.repeat_x)), + IdentifierStyleValue::create(to_value_id(layer.repeat_y)), + }; + return StyleValueList::create(move(repeat), StyleValueList::Separator::Space); + }, + [] { return BackgroundRepeatStyleValue::create(CSS::Repeat::Repeat, CSS::Repeat::Repeat); }); case CSS::PropertyID::BorderBottom: { auto border = layout_node.computed_values().border_bottom(); auto width = LengthStyleValue::create(Length::make_px(border.width));