RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 21:27:34 +00:00
Code Issues Activity Actions

LibWeb: Add Paintable::layout_box() accessor

Browse source 
Let's move away from accessing the m_layout_box member directly.
This commit is contained in:
Andreas Kling 2022-03-10 16:03:41 +01:00
parent 9461e44afa
commit 0500dbc3f6
2 changed files with 26 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

38
Userland/Libraries/LibWeb/Painting/Paintable.cpp
View file

@ -37,7 +37,7 @@ void Paintable::set_offset(const Gfx::FloatPoint& offset)
return; return;
m_offset = offset; m_offset = offset;
// FIXME: This const_cast is gross. // FIXME: This const_cast is gross.
const_cast<Layout::Box&>(m_layout_box).did_set_rect(); const_cast<Layout::Box&>(layout_box()).did_set_rect();
} }
void Paintable::set_content_size(Gfx::FloatSize const& size) void Paintable::set_content_size(Gfx::FloatSize const& size)
@ -46,13 +46,13 @@ void Paintable::set_content_size(Gfx::FloatSize const& size)
return; return;
m_content_size = size; m_content_size = size;
// FIXME: This const_cast is gross. // FIXME: This const_cast is gross.
const_cast<Layout::Box&>(m_layout_box).did_set_rect(); const_cast<Layout::Box&>(layout_box()).did_set_rect();
} }
Gfx::FloatPoint Paintable::effective_offset() const Gfx::FloatPoint Paintable::effective_offset() const
{ {
if (m_containing_line_box_fragment.has_value()) { if (m_containing_line_box_fragment.has_value()) {
auto const& fragment = m_layout_box.containing_block()->paint_box()->line_boxes()[m_containing_line_box_fragment->line_box_index].fragments()[m_containing_line_box_fragment->fragment_index]; auto const& fragment = layout_box().containing_block()->paint_box()->line_boxes()[m_containing_line_box_fragment->line_box_index].fragments()[m_containing_line_box_fragment->fragment_index];
return fragment.offset(); return fragment.offset();
} }
return m_offset; return m_offset;
@ -61,7 +61,7 @@ Gfx::FloatPoint Paintable::effective_offset() const
Gfx::FloatRect Paintable::absolute_rect() const Gfx::FloatRect Paintable::absolute_rect() const
{ {
Gfx::FloatRect rect { effective_offset(), content_size() }; Gfx::FloatRect rect { effective_offset(), content_size() };
for (auto* block = m_layout_box.containing_block(); block; block = block->containing_block()) for (auto* block = layout_box().containing_block(); block; block = block->containing_block())
rect.translate_by(block->paint_box()->effective_offset()); rect.translate_by(block->paint_box()->effective_offset());
return rect; return rect;
} }
@ -73,7 +73,7 @@ void Paintable::set_containing_line_box_fragment(Optional<Layout::LineBoxFragmen
Painting::StackingContext* Paintable::enclosing_stacking_context() Painting::StackingContext* Paintable::enclosing_stacking_context()
{ {
for (auto* ancestor = m_layout_box.parent(); ancestor; ancestor = ancestor->parent()) { for (auto* ancestor = layout_box().parent(); ancestor; ancestor = ancestor->parent()) {
if (!is<Layout::Box>(ancestor)) if (!is<Layout::Box>(ancestor))
continue; continue;
auto& ancestor_box = static_cast<Layout::Box&>(const_cast<Layout::NodeWithStyle&>(*ancestor)); auto& ancestor_box = static_cast<Layout::Box&>(const_cast<Layout::NodeWithStyle&>(*ancestor));
@ -100,7 +100,7 @@ void Paintable::paint(PaintContext& context, PaintPhase phase) const
paint_border(context); paint_border(context);
} }
if (phase == PaintPhase::Overlay && m_layout_box.dom_node() && m_layout_box.document().inspected_node() == m_layout_box.dom_node()) { if (phase == PaintPhase::Overlay && layout_box().dom_node() && layout_box().document().inspected_node() == layout_box().dom_node()) {
auto content_rect = absolute_rect(); auto content_rect = absolute_rect();
auto margin_box = box_model().margin_box(); auto margin_box = box_model().margin_box();
@ -124,10 +124,10 @@ void Paintable::paint(PaintContext& context, PaintPhase phase) const
paint_inspector_rect(content_rect, Color::Magenta); paint_inspector_rect(content_rect, Color::Magenta);
StringBuilder builder; StringBuilder builder;
if (m_layout_box.dom_node()) if (layout_box().dom_node())
builder.append(m_layout_box.dom_node()->debug_description()); builder.append(layout_box().dom_node()->debug_description());
else else
builder.append(m_layout_box.debug_description()); builder.append(layout_box().debug_description());
builder.appendff(" {}x{} @ {},{}", border_rect.width(), border_rect.height(), border_rect.x(), border_rect.y()); builder.appendff(" {}x{} @ {},{}", border_rect.width(), border_rect.height(), border_rect.x(), border_rect.y());
auto size_text = builder.to_string(); auto size_text = builder.to_string();
auto size_text_rect = border_rect; auto size_text_rect = border_rect;
@ -140,7 +140,7 @@ void Paintable::paint(PaintContext& context, PaintPhase phase) const
context.painter().draw_text(enclosing_int_rect(size_text_rect), size_text, Gfx::TextAlignment::Center, context.palette().color(Gfx::ColorRole::TooltipText)); context.painter().draw_text(enclosing_int_rect(size_text_rect), size_text, Gfx::TextAlignment::Center, context.palette().color(Gfx::ColorRole::TooltipText));
} }
if (phase == PaintPhase::FocusOutline && m_layout_box.dom_node() && m_layout_box.dom_node()->is_element() && verify_cast<DOM::Element>(*m_layout_box.dom_node()).is_focused()) { if (phase == PaintPhase::FocusOutline && layout_box().dom_node() && layout_box().dom_node()->is_element() && verify_cast<DOM::Element>(*layout_box().dom_node()).is_focused()) {
context.painter().draw_rect(enclosing_int_rect(absolute_rect()), context.palette().focus_outline()); context.painter().draw_rect(enclosing_int_rect(absolute_rect()), context.palette().focus_outline());
} }
} }
@ -159,14 +159,14 @@ void Paintable::paint_border(PaintContext& context) const
void Paintable::paint_background(PaintContext& context) const void Paintable::paint_background(PaintContext& context) const
{ {
// If the body's background properties were propagated to the root element, do no re-paint the body's background. // If the body's background properties were propagated to the root element, do no re-paint the body's background.
if (m_layout_box.is_body() && document().html_element()->should_use_body_background_properties()) if (layout_box().is_body() && document().html_element()->should_use_body_background_properties())
return; return;
Gfx::IntRect background_rect; Gfx::IntRect background_rect;
Color background_color = computed_values().background_color(); Color background_color = computed_values().background_color();
auto* background_layers = &computed_values().background_layers(); auto* background_layers = &computed_values().background_layers();
if (m_layout_box.is_root_element()) { if (layout_box().is_root_element()) {
// CSS 2.1 Appendix E.2: If the element is a root element, paint the background over the entire canvas. // CSS 2.1 Appendix E.2: If the element is a root element, paint the background over the entire canvas.
background_rect = context.viewport_rect(); background_rect = context.viewport_rect();
@ -185,7 +185,7 @@ void Paintable::paint_background(PaintContext& context) const
if (computed_values().border_top().width || computed_values().border_right().width || computed_values().border_bottom().width || computed_values().border_left().width) if (computed_values().border_top().width || computed_values().border_right().width || computed_values().border_bottom().width || computed_values().border_left().width)
background_rect = enclosing_int_rect(absolute_border_box_rect()); background_rect = enclosing_int_rect(absolute_border_box_rect());
Painting::paint_background(context, m_layout_box, background_rect, background_color, background_layers, normalized_border_radius_data()); Painting::paint_background(context, layout_box(), background_rect, background_color, background_layers, normalized_border_radius_data());
} }
void Paintable::paint_box_shadow(PaintContext& context) const void Paintable::paint_box_shadow(PaintContext& context) const
@ -199,10 +199,10 @@ void Paintable::paint_box_shadow(PaintContext& context) const
for (auto const& layer : box_shadow_data) { for (auto const& layer : box_shadow_data) {
resolved_box_shadow_data.empend( resolved_box_shadow_data.empend(
layer.color, layer.color,
static_cast<int>(layer.offset_x.to_px(m_layout_box)), static_cast<int>(layer.offset_x.to_px(layout_box())),
static_cast<int>(layer.offset_y.to_px(m_layout_box)), static_cast<int>(layer.offset_y.to_px(layout_box())),
static_cast<int>(layer.blur_radius.to_px(m_layout_box)), static_cast<int>(layer.blur_radius.to_px(layout_box())),
static_cast<int>(layer.spread_distance.to_px(m_layout_box)), static_cast<int>(layer.spread_distance.to_px(layout_box())),
layer.placement == CSS::BoxShadowPlacement::Outer ? BoxShadowPlacement::Outer : BoxShadowPlacement::Inner); layer.placement == CSS::BoxShadowPlacement::Outer ? BoxShadowPlacement::Outer : BoxShadowPlacement::Inner);
} }
Painting::paint_box_shadow(context, enclosing_int_rect(absolute_border_box_rect()), resolved_box_shadow_data); Painting::paint_box_shadow(context, enclosing_int_rect(absolute_border_box_rect()), resolved_box_shadow_data);
@ -210,7 +210,7 @@ void Paintable::paint_box_shadow(PaintContext& context) const
BorderRadiusData Paintable::normalized_border_radius_data() const BorderRadiusData Paintable::normalized_border_radius_data() const
{ {
return Painting::normalized_border_radius_data(m_layout_box, absolute_border_box_rect(), return Painting::normalized_border_radius_data(layout_box(), absolute_border_box_rect(),
computed_values().border_top_left_radius(), computed_values().border_top_left_radius(),
computed_values().border_top_right_radius(), computed_values().border_top_right_radius(),
computed_values().border_bottom_right_radius(), computed_values().border_bottom_right_radius(),
@ -249,7 +249,7 @@ void PaintableWithLines::paint(PaintContext& context, PaintPhase phase) const
context.painter().save(); context.painter().save();
// FIXME: Handle overflow-x and overflow-y being different values. // FIXME: Handle overflow-x and overflow-y being different values.
context.painter().add_clip_rect(enclosing_int_rect(absolute_padding_box_rect())); context.painter().add_clip_rect(enclosing_int_rect(absolute_padding_box_rect()));
auto scroll_offset = static_cast<Layout::BlockContainer const&>(m_layout_box).scroll_offset(); auto scroll_offset = static_cast<Layout::BlockContainer const&>(layout_box()).scroll_offset();
context.painter().translate(-scroll_offset.to_type<int>()); context.painter().translate(-scroll_offset.to_type<int>());
} }

12
Userland/Libraries/LibWeb/Painting/Paintable.h
View file

@ -24,12 +24,14 @@ public:
virtual void paint(PaintContext&, PaintPhase) const; virtual void paint(PaintContext&, PaintPhase) const;
bool is_visible() const { return m_layout_box.is_visible(); } bool is_visible() const { return layout_box().is_visible(); }
Layout::Box const& m_layout_box; Layout::Box const& m_layout_box;
auto const& box_model() const { return m_layout_box.box_model(); } Layout::Box const& layout_box() const { return m_layout_box; }
auto const& computed_values() const { return m_layout_box.computed_values(); }
auto const& box_model() const { return layout_box().box_model(); }
auto const& computed_values() const { return layout_box().computed_values(); }
struct OverflowData { struct OverflowData {
Gfx::FloatRect scrollable_overflow_rect; Gfx::FloatRect scrollable_overflow_rect;
@ -113,8 +115,8 @@ public:
void set_stacking_context(NonnullOwnPtr<Painting::StackingContext> context) { m_stacking_context = move(context); } void set_stacking_context(NonnullOwnPtr<Painting::StackingContext> context) { m_stacking_context = move(context); }
StackingContext* enclosing_stacking_context(); StackingContext* enclosing_stacking_context();
DOM::Node const* dom_node() const { return m_layout_box.dom_node(); } DOM::Node const* dom_node() const { return layout_box().dom_node(); }
DOM::Document const& document() const { return m_layout_box.document(); } DOM::Document const& document() const { return layout_box().document(); }
virtual void before_children_paint(PaintContext&, PaintPhase) const; virtual void before_children_paint(PaintContext&, PaintPhase) const;
virtual void after_children_paint(PaintContext&, PaintPhase) const; virtual void after_children_paint(PaintContext&, PaintPhase) const;