summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Userland/Libraries/LibWeb/CSS/ComputedValues.h14
-rw-r--r--Userland/Libraries/LibWeb/CSS/Properties.json15
-rw-r--r--Userland/Libraries/LibWeb/CSS/ResolvedCSSStyleDeclaration.cpp13
-rw-r--r--Userland/Libraries/LibWeb/CSS/StyleComputer.cpp27
-rw-r--r--Userland/Libraries/LibWeb/CSS/StyleProperties.cpp61
-rw-r--r--Userland/Libraries/LibWeb/CSS/StyleProperties.h3
-rw-r--r--Userland/Libraries/LibWeb/DOM/Document.cpp4
-rw-r--r--Userland/Libraries/LibWeb/Layout/Box.cpp10
-rw-r--r--Userland/Libraries/LibWeb/Layout/InlineNode.cpp4
-rw-r--r--Userland/Libraries/LibWeb/Layout/Node.cpp10
10 files changed, 54 insertions, 107 deletions
diff --git a/Userland/Libraries/LibWeb/CSS/ComputedValues.h b/Userland/Libraries/LibWeb/CSS/ComputedValues.h
index c939470a55..a15f1cec15 100644
--- a/Userland/Libraries/LibWeb/CSS/ComputedValues.h
+++ b/Userland/Libraries/LibWeb/CSS/ComputedValues.h
@@ -65,6 +65,11 @@ struct BoxShadowData {
Color color {};
};
+struct BackgroundRepeatData {
+ CSS::Repeat repeat_x;
+ CSS::Repeat repeat_y;
+};
+
class ComputedValues {
public:
CSS::Float float_() const { return m_noninherited.float_; }
@@ -114,8 +119,7 @@ public:
Color color() const { return m_inherited.color; }
Color background_color() const { return m_noninherited.background_color; }
- CSS::Repeat background_repeat_x() const { return m_noninherited.background_repeat_x; }
- CSS::Repeat background_repeat_y() const { return m_noninherited.background_repeat_y; }
+ BackgroundRepeatData background_repeat() const { return m_noninherited.background_repeat; }
CSS::ListStyleType list_style_type() const { return m_inherited.list_style_type; }
@@ -172,8 +176,7 @@ protected:
Length border_top_left_radius;
Length border_top_right_radius;
Color background_color { InitialValues::background_color() };
- CSS::Repeat background_repeat_x { InitialValues::background_repeat() };
- CSS::Repeat background_repeat_y { InitialValues::background_repeat() };
+ BackgroundRepeatData background_repeat { InitialValues::background_repeat(), InitialValues::background_repeat() };
CSS::FlexDirection flex_direction { InitialValues::flex_direction() };
CSS::FlexWrap flex_wrap { InitialValues::flex_wrap() };
CSS::FlexBasisData flex_basis {};
@@ -199,8 +202,7 @@ public:
void set_cursor(CSS::Cursor cursor) { m_inherited.cursor = cursor; }
void set_pointer_events(CSS::PointerEvents value) { m_inherited.pointer_events = value; }
void set_background_color(const Color& color) { m_noninherited.background_color = color; }
- void set_background_repeat_x(CSS::Repeat repeat) { m_noninherited.background_repeat_x = repeat; }
- void set_background_repeat_y(CSS::Repeat repeat) { m_noninherited.background_repeat_y = repeat; }
+ void set_background_repeat(BackgroundRepeatData repeat) { m_noninherited.background_repeat = repeat; }
void set_float(CSS::Float value) { m_noninherited.float_ = value; }
void set_clear(CSS::Clear value) { m_noninherited.clear = value; }
void set_z_index(Optional<int> value) { m_noninherited.z_index = value; }
diff --git a/Userland/Libraries/LibWeb/CSS/Properties.json b/Userland/Libraries/LibWeb/CSS/Properties.json
index 8e2ccafde1..9d3f520891 100644
--- a/Userland/Libraries/LibWeb/CSS/Properties.json
+++ b/Userland/Libraries/LibWeb/CSS/Properties.json
@@ -78,6 +78,7 @@
]
},
"background-repeat": {
+ "inherited": false,
"initial": "repeat",
"max-values": 2,
"valid-identifiers": [
@@ -87,22 +88,8 @@
"repeat-y",
"round",
"space"
- ],
- "longhands": [
- "background-repeat-x",
- "background-repeat-y"
]
},
- "background-repeat-x": {
- "inherited": false,
- "initial": "repeat",
- "pseudo": true
- },
- "background-repeat-y": {
- "inherited": false,
- "initial": "repeat",
- "pseudo": true
- },
"border": {
"longhands": [
"border-width",
diff --git a/Userland/Libraries/LibWeb/CSS/ResolvedCSSStyleDeclaration.cpp b/Userland/Libraries/LibWeb/CSS/ResolvedCSSStyleDeclaration.cpp
index e360550acd..a995bc7f3e 100644
--- a/Userland/Libraries/LibWeb/CSS/ResolvedCSSStyleDeclaration.cpp
+++ b/Userland/Libraries/LibWeb/CSS/ResolvedCSSStyleDeclaration.cpp
@@ -660,15 +660,10 @@ RefPtr<StyleValue> ResolvedCSSStyleDeclaration::style_value_for_property(Layout:
return ColorStyleValue::create(layout_node.computed_values().color());
case PropertyID::BackgroundColor:
return ColorStyleValue::create(layout_node.computed_values().background_color());
- case CSS::PropertyID::BackgroundRepeatX:
- return IdentifierStyleValue::create(to_css_value_id(layout_node.computed_values().background_repeat_x()));
- case CSS::PropertyID::BackgroundRepeatY:
- return IdentifierStyleValue::create(to_css_value_id(layout_node.computed_values().background_repeat_y()));
- case CSS::PropertyID::BackgroundRepeat: {
- auto maybe_background_repeat_x = property(CSS::PropertyID::BackgroundRepeatX);
- auto maybe_background_repeat_y = property(CSS::PropertyID::BackgroundRepeatY);
- return BackgroundRepeatStyleValue::create(value_or_default(maybe_background_repeat_x, IdentifierStyleValue::create(CSS::ValueID::RepeatX)), value_or_default(maybe_background_repeat_y, IdentifierStyleValue::create(CSS::ValueID::RepeatY)));
- }
+ case CSS::PropertyID::BackgroundRepeat:
+ return BackgroundRepeatStyleValue::create(
+ IdentifierStyleValue::create(to_css_value_id(layout_node.computed_values().background_repeat().repeat_x)),
+ IdentifierStyleValue::create(to_css_value_id(layout_node.computed_values().background_repeat().repeat_y)));
case CSS::PropertyID::Background: {
auto maybe_background_color = property(CSS::PropertyID::BackgroundColor);
auto maybe_background_image = property(CSS::PropertyID::BackgroundImage);
diff --git a/Userland/Libraries/LibWeb/CSS/StyleComputer.cpp b/Userland/Libraries/LibWeb/CSS/StyleComputer.cpp
index b2ab50f6bc..e26547fb66 100644
--- a/Userland/Libraries/LibWeb/CSS/StyleComputer.cpp
+++ b/Userland/Libraries/LibWeb/CSS/StyleComputer.cpp
@@ -414,33 +414,12 @@ static void set_property_expanding_shorthands(StyleProperties& style, CSS::Prope
auto& background_repeat_list = value.as_value_list().values();
// FIXME: Handle multiple backgrounds.
if (!background_repeat_list.is_empty()) {
- auto& maybe_background_repeat = background_repeat_list.first();
- if (maybe_background_repeat.is_background_repeat()) {
- auto& background_repeat = maybe_background_repeat.as_background_repeat();
- set_property_expanding_shorthands(style, PropertyID::BackgroundRepeatX, background_repeat.repeat_x(), document, true);
- set_property_expanding_shorthands(style, PropertyID::BackgroundRepeatY, background_repeat.repeat_y(), document, true);
- }
+ auto& background_repeat = background_repeat_list.first();
+ style.set_property(CSS::PropertyID::BackgroundRepeat, background_repeat);
}
return;
}
- if (value.is_background_repeat()) {
- auto& background_repeat = value.as_background_repeat();
- set_property_expanding_shorthands(style, PropertyID::BackgroundRepeatX, background_repeat.repeat_x(), document, true);
- set_property_expanding_shorthands(style, PropertyID::BackgroundRepeatY, background_repeat.repeat_y(), document, true);
- return;
- }
-
- set_property_expanding_shorthands(style, PropertyID::BackgroundRepeatX, value, document, true);
- set_property_expanding_shorthands(style, PropertyID::BackgroundRepeatY, value, document, true);
- return;
- }
-
- if (property_id == CSS::PropertyID::BackgroundRepeatX || property_id == CSS::PropertyID::BackgroundRepeatY) {
- auto value_id = value.to_identifier();
- if (value_id == CSS::ValueID::RepeatX || value_id == CSS::ValueID::RepeatY)
- return;
-
- style.set_property(property_id, value);
+ style.set_property(CSS::PropertyID::BackgroundRepeat, value);
return;
}
diff --git a/Userland/Libraries/LibWeb/CSS/StyleProperties.cpp b/Userland/Libraries/LibWeb/CSS/StyleProperties.cpp
index 69eb6d6937..35221e1384 100644
--- a/Userland/Libraries/LibWeb/CSS/StyleProperties.cpp
+++ b/Userland/Libraries/LibWeb/CSS/StyleProperties.cpp
@@ -688,42 +688,33 @@ Optional<CSS::Overflow> StyleProperties::overflow(CSS::PropertyID property_id) c
}
}
-Optional<CSS::Repeat> StyleProperties::background_repeat_x() const
-{
- auto value = property(CSS::PropertyID::BackgroundRepeatX);
- if (!value.has_value())
- return {};
- switch (value.value()->to_identifier()) {
- case CSS::ValueID::NoRepeat:
- return CSS::Repeat::NoRepeat;
- case CSS::ValueID::Repeat:
- return CSS::Repeat::Repeat;
- case CSS::ValueID::Round:
- return CSS::Repeat::Round;
- case CSS::ValueID::Space:
- return CSS::Repeat::Space;
- default:
- return {};
- }
-}
+Optional<BackgroundRepeatData> StyleProperties::background_repeat() const
+{
+ auto value = property(CSS::PropertyID::BackgroundRepeat);
+ if (!value.has_value() || !value.value()->is_background_repeat())
+ return {};
+ auto& background_repeat = value.value()->as_background_repeat();
+
+ auto to_repeat = [](auto value) -> Optional<CSS::Repeat> {
+ switch (value->to_identifier()) {
+ case CSS::ValueID::NoRepeat:
+ return CSS::Repeat::NoRepeat;
+ case CSS::ValueID::Repeat:
+ return CSS::Repeat::Repeat;
+ case CSS::ValueID::Round:
+ return CSS::Repeat::Round;
+ case CSS::ValueID::Space:
+ return CSS::Repeat::Space;
+ default:
+ return {};
+ }
+ };
+ auto repeat_x = to_repeat(background_repeat.repeat_x());
+ auto repeat_y = to_repeat(background_repeat.repeat_y());
+ if (repeat_x.has_value() && repeat_y.has_value())
+ return BackgroundRepeatData { repeat_x.value(), repeat_y.value() };
-Optional<CSS::Repeat> StyleProperties::background_repeat_y() const
-{
- auto value = property(CSS::PropertyID::BackgroundRepeatY);
- if (!value.has_value())
- return {};
- switch (value.value()->to_identifier()) {
- case CSS::ValueID::NoRepeat:
- return CSS::Repeat::NoRepeat;
- case CSS::ValueID::Repeat:
- return CSS::Repeat::Repeat;
- case CSS::ValueID::Round:
- return CSS::Repeat::Round;
- case CSS::ValueID::Space:
- return CSS::Repeat::Space;
- default:
- return {};
- }
+ return {};
}
Optional<CSS::BoxShadowData> StyleProperties::box_shadow() const
diff --git a/Userland/Libraries/LibWeb/CSS/StyleProperties.h b/Userland/Libraries/LibWeb/CSS/StyleProperties.h
index 6472f87208..12cb64d423 100644
--- a/Userland/Libraries/LibWeb/CSS/StyleProperties.h
+++ b/Userland/Libraries/LibWeb/CSS/StyleProperties.h
@@ -62,8 +62,7 @@ public:
Optional<CSS::JustifyContent> justify_content() const;
Optional<CSS::Overflow> overflow_x() const;
Optional<CSS::Overflow> overflow_y() const;
- Optional<CSS::Repeat> background_repeat_x() const;
- Optional<CSS::Repeat> background_repeat_y() const;
+ Optional<BackgroundRepeatData> background_repeat() const;
Optional<CSS::BoxShadowData> box_shadow() const;
CSS::BoxSizing box_sizing() const;
Optional<CSS::PointerEvents> pointer_events() const;
diff --git a/Userland/Libraries/LibWeb/DOM/Document.cpp b/Userland/Libraries/LibWeb/DOM/Document.cpp
index 60149a939d..3b2e13ce56 100644
--- a/Userland/Libraries/LibWeb/DOM/Document.cpp
+++ b/Userland/Libraries/LibWeb/DOM/Document.cpp
@@ -379,7 +379,7 @@ CSS::Repeat Document::background_repeat_x() const
if (!body_layout_node)
return CSS::Repeat::Repeat;
- return body_layout_node->computed_values().background_repeat_x();
+ return body_layout_node->computed_values().background_repeat().repeat_x;
}
CSS::Repeat Document::background_repeat_y() const
@@ -392,7 +392,7 @@ CSS::Repeat Document::background_repeat_y() const
if (!body_layout_node)
return CSS::Repeat::Repeat;
- return body_layout_node->computed_values().background_repeat_y();
+ return body_layout_node->computed_values().background_repeat().repeat_y;
}
// https://html.spec.whatwg.org/multipage/urls-and-fetching.html#parse-a-url
diff --git a/Userland/Libraries/LibWeb/Layout/Box.cpp b/Userland/Libraries/LibWeb/Layout/Box.cpp
index 2423679d72..cc452d6b7e 100644
--- a/Userland/Libraries/LibWeb/Layout/Box.cpp
+++ b/Userland/Libraries/LibWeb/Layout/Box.cpp
@@ -73,8 +73,7 @@ void Box::paint_background(PaintContext& context)
Gfx::IntRect background_rect;
Color background_color = computed_values().background_color();
const Gfx::Bitmap* background_image = this->background_image() ? this->background_image()->bitmap() : nullptr;
- CSS::Repeat background_repeat_x = computed_values().background_repeat_x();
- CSS::Repeat background_repeat_y = computed_values().background_repeat_y();
+ CSS::BackgroundRepeatData background_repeat = computed_values().background_repeat();
if (is_root_element()) {
// CSS 2.1 Appendix E.2: If the element is a root element, paint the background over the entire canvas.
@@ -85,8 +84,7 @@ void Box::paint_background(PaintContext& context)
if (document().html_element()->should_use_body_background_properties()) {
background_color = document().background_color(context.palette());
background_image = document().background_image();
- background_repeat_x = document().background_repeat_x();
- background_repeat_y = document().background_repeat_y();
+ background_repeat = { document().background_repeat_x(), document().background_repeat_y() };
}
} else {
background_rect = enclosing_int_rect(padded_rect());
@@ -100,8 +98,8 @@ void Box::paint_background(PaintContext& context)
auto background_data = Painting::BackgroundData {
.color = background_color,
.image = background_image,
- .repeat_x = background_repeat_x,
- .repeat_y = background_repeat_y
+ .repeat_x = background_repeat.repeat_x,
+ .repeat_y = background_repeat.repeat_y
};
Painting::paint_background(context, background_rect, background_data, normalized_border_radius_data());
}
diff --git a/Userland/Libraries/LibWeb/Layout/InlineNode.cpp b/Userland/Libraries/LibWeb/Layout/InlineNode.cpp
index f2b3651f2c..224328e3db 100644
--- a/Userland/Libraries/LibWeb/Layout/InlineNode.cpp
+++ b/Userland/Libraries/LibWeb/Layout/InlineNode.cpp
@@ -52,8 +52,8 @@ void InlineNode::paint(PaintContext& context, PaintPhase phase)
auto background_data = Painting::BackgroundData {
.color = computed_values().background_color(),
.image = background_image() ? background_image()->bitmap() : nullptr,
- .repeat_x = computed_values().background_repeat_x(),
- .repeat_y = computed_values().background_repeat_y()
+ .repeat_x = computed_values().background_repeat().repeat_x,
+ .repeat_y = computed_values().background_repeat().repeat_y
};
auto top_left_border_radius = computed_values().border_top_left_radius();
diff --git a/Userland/Libraries/LibWeb/Layout/Node.cpp b/Userland/Libraries/LibWeb/Layout/Node.cpp
index 6df55962dd..a855d068ea 100644
--- a/Userland/Libraries/LibWeb/Layout/Node.cpp
+++ b/Userland/Libraries/LibWeb/Layout/Node.cpp
@@ -240,13 +240,9 @@ void NodeWithStyle::apply_style(const CSS::StyleProperties& specified_style)
if (border_top_right_radius.has_value())
computed_values.set_border_top_right_radius(border_top_right_radius.value()->to_length());
- auto background_repeat_x = specified_style.background_repeat_x();
- if (background_repeat_x.has_value())
- computed_values.set_background_repeat_x(background_repeat_x.value());
-
- auto background_repeat_y = specified_style.background_repeat_y();
- if (background_repeat_y.has_value())
- computed_values.set_background_repeat_y(background_repeat_y.value());
+ auto background_repeat = specified_style.background_repeat();
+ if (background_repeat.has_value())
+ computed_values.set_background_repeat(background_repeat.value());
computed_values.set_display(specified_style.display());
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-17 00:57:16 +0000