RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 11:28:12 +00:00
Code Issues Activity Actions

LibWeb: Remove background_image from NodeWithStyle

Browse source 
We now entirely use the background-layers to check images.
This commit is contained in:
Sam Atkins 2021-11-12 13:53:20 +00:00 • committed by Andreas Kling
parent a214036509
commit 3d127472ba
3 changed files with 7 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Userland/Libraries/LibWeb/HTML/HTMLHtmlElement.cpp
View file

@ -20,9 +20,14 @@ HTMLHtmlElement::~HTMLHtmlElement()
bool HTMLHtmlElement::should_use_body_background_properties() const bool HTMLHtmlElement::should_use_body_background_properties() const
{ {
auto background_color = layout_node()->computed_values().background_color(); auto background_color = layout_node()->computed_values().background_color();
const auto* background_image = layout_node()->background_image(); auto const& background_layers = layout_node()->background_layers();
return (background_color == Color::Transparent) && !background_image; for (auto& layer : background_layers) {
if (layer.image)
return false;
}
return (background_color == Color::Transparent);
} }
} }

8
Userland/Libraries/LibWeb/Layout/Node.cpp
View file

@ -274,13 +274,6 @@ void NodeWithStyle::apply_style(const CSS::StyleProperties& specified_style)
} }
computed_values.set_background_color(specified_style.color_or_fallback(CSS::PropertyID::BackgroundColor, *this, CSS::InitialValues::background_color())); computed_values.set_background_color(specified_style.color_or_fallback(CSS::PropertyID::BackgroundColor, *this, CSS::InitialValues::background_color()));
// FIXME: Remove this
auto bgimage = specified_style.property(CSS::PropertyID::BackgroundImage);
if (bgimage.has_value() && bgimage.value()->is_image()) {
m_background_image = bgimage.value()->as_image();
m_background_image->load_bitmap(document());
}
computed_values.set_box_sizing(specified_style.box_sizing()); computed_values.set_box_sizing(specified_style.box_sizing());
// FIXME: BorderXRadius properties are now BorderRadiusStyleValues, so make use of that. // FIXME: BorderXRadius properties are now BorderRadiusStyleValues, so make use of that.
@ -485,7 +478,6 @@ NonnullRefPtr<NodeWithStyle> NodeWithStyle::create_anonymous_wrapper() const
wrapper->m_font = m_font; wrapper->m_font = m_font;
wrapper->m_font_size = m_font_size; wrapper->m_font_size = m_font_size;
wrapper->m_line_height = m_line_height; wrapper->m_line_height = m_line_height;
wrapper->m_background_image = m_background_image;
return wrapper; return wrapper;
} }

2
Userland/Libraries/LibWeb/Layout/Node.h
View file

@ -205,7 +205,6 @@ public:
const Gfx::Font& font() const { return *m_font; } const Gfx::Font& font() const { return *m_font; }
float line_height() const { return m_line_height; } float line_height() const { return m_line_height; }
float font_size() const { return m_font_size; } float font_size() const { return m_font_size; }
const CSS::ImageStyleValue* background_image() const { return m_background_image; }
Vector<CSS::BackgroundLayerData> const& background_layers() const { return computed_values().background_layers(); } Vector<CSS::BackgroundLayerData> const& background_layers() const { return computed_values().background_layers(); }
const CSS::ImageStyleValue* list_style_image() const { return m_list_style_image; } const CSS::ImageStyleValue* list_style_image() const { return m_list_style_image; }
@ -223,7 +222,6 @@ private:
RefPtr<Gfx::Font> m_font; RefPtr<Gfx::Font> m_font;
float m_line_height { 0 }; float m_line_height { 0 };
float m_font_size { 0 }; float m_font_size { 0 };
RefPtr<CSS::ImageStyleValue> m_background_image;
RefPtr<CSS::ImageStyleValue> m_list_style_image; RefPtr<CSS::ImageStyleValue> m_list_style_image;
bool m_has_definite_height { false }; bool m_has_definite_height { false };