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

LibWeb/Layout: Rename Box::{paint => paintable}_box()

Browse source 
It returns a PaintableBox, not a 'PaintBox'.
This commit is contained in:
Linus Groh 2023-04-20 16:00:42 +01:00 • committed by Andreas Kling
parent ec37b55777
commit 754e458d0a
20 changed files with 50 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Userland/Libraries/LibWeb/Layout/BlockContainer.cpp
View file

@ -23,7 +23,7 @@ BlockContainer::~BlockContainer() = default;
Painting::PaintableWithLines const* BlockContainer::paint_box() const
{
return static_cast<Painting::PaintableWithLines const*>(Box::paint_box());
return static_cast<Painting::PaintableWithLines const*>(Box::paintable_box());
}
JS::GCPtr<Painting::Paintable> BlockContainer::create_paintable() const

6
Userland/Libraries/LibWeb/Layout/Box.cpp
View file

@ -68,8 +68,8 @@ void Box::set_scroll_offset(CSSPixelPoint offset)
void Box::set_needs_display()
{
if (paint_box())
browsing_context().set_needs_display(paint_box()->absolute_rect());
if (paintable_box())
browsing_context().set_needs_display(paintable_box()->absolute_rect());
}
bool Box::is_body() const
@ -82,7 +82,7 @@ JS::GCPtr<Painting::Paintable> Box::create_paintable() const
return Painting::PaintableBox::create(*this);
}
Painting::PaintableBox const* Box::paint_box() const
Painting::PaintableBox const* Box::paintable_box() const
{
return static_cast<Painting::PaintableBox const*>(Node::paintable());
}

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

@ -22,7 +22,7 @@ class Box : public NodeWithStyleAndBoxModelMetrics {
JS_CELL(Box, NodeWithStyleAndBoxModelMetrics);
public:
Painting::PaintableBox const* paint_box() const;
Painting::PaintableBox const* paintable_box() const;
virtual void set_needs_display() override;

2
Userland/Libraries/LibWeb/Layout/FrameBox.cpp
View file

@ -33,7 +33,7 @@ void FrameBox::did_set_rect()
ReplacedBox::did_set_rect();
VERIFY(dom_node().nested_browsing_context());
dom_node().nested_browsing_context()->set_size(paint_box()->content_size());
dom_node().nested_browsing_context()->set_size(paintable_box()->content_size());
}
JS::GCPtr<Painting::Paintable> FrameBox::create_paintable() const

2
Userland/Libraries/LibWeb/Layout/ImageBox.cpp
View file

@ -92,7 +92,7 @@ bool ImageBox::renders_as_alt_text() const
void ImageBox::browsing_context_did_set_viewport_rect(CSSPixelRect const& viewport_rect)
{
m_image_loader.set_visible_in_viewport(paint_box() && viewport_rect.intersects(paint_box()->absolute_rect()));
m_image_loader.set_visible_in_viewport(paintable_box() && viewport_rect.intersects(paintable_box()->absolute_rect()));
}
JS::GCPtr<Painting::Paintable> ImageBox::create_paintable() const

4
Userland/Libraries/LibWeb/Layout/Label.cpp
View file

@ -39,7 +39,7 @@ void Label::handle_mouseup_on_label(Badge<Painting::TextPaintable>, CSSPixelPoin
return;
if (auto* control = labeled_control(); control) {
bool is_inside_control = control->paint_box()->absolute_rect().contains(position);
bool is_inside_control = control->paintable_box()->absolute_rect().contains(position);
bool is_inside_label = paint_box()->absolute_rect().contains(position);
if (is_inside_control || is_inside_label)
@ -55,7 +55,7 @@ void Label::handle_mousemove_on_label(Badge<Painting::TextPaintable>, CSSPixelPo
return;
if (auto* control = labeled_control(); control) {
bool is_inside_control = control->paint_box()->absolute_rect().contains(position);
bool is_inside_control = control->paintable_box()->absolute_rect().contains(position);
bool is_inside_label = paint_box()->absolute_rect().contains(position);
control->paintable()->handle_associated_label_mousemove({}, is_inside_control || is_inside_label);

2
Userland/Libraries/LibWeb/Layout/LayoutState.cpp
View file

@ -75,7 +75,7 @@ void LayoutState::commit()
// For boxes, transfer all the state needed for painting.
if (is<Layout::Box>(node)) {
auto& box = static_cast<Layout::Box const&>(node);
auto& paint_box = const_cast<Painting::PaintableBox&>(*box.paint_box());
auto& paint_box = const_cast<Painting::PaintableBox&>(*box.paintable_box());
paint_box.set_offset(used_values.offset);
paint_box.set_content_size(used_values.content_width(), used_values.content_height());
paint_box.set_overflow_data(move(used_values.overflow_data));

2
Userland/Libraries/LibWeb/Layout/LineBoxFragment.cpp
View file

@ -37,7 +37,7 @@ StringView LineBoxFragment::text() const
CSSPixelRect const LineBoxFragment::absolute_rect() const
{
CSSPixelRect rect { {}, size() };
rect.set_location(m_layout_node->containing_block()->paint_box()->absolute_position());
rect.set_location(m_layout_node->containing_block()->paintable_box()->absolute_position());
rect.translate_by(offset());
return rect;
}

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

@ -193,11 +193,11 @@ void Node::set_needs_display()
auto* containing_block = this->containing_block();
if (!containing_block)
return;
if (!containing_block->paint_box())
if (!containing_block->paintable_box())
return;
if (!is<Painting::PaintableWithLines>(*containing_block->paint_box()))
if (!is<Painting::PaintableWithLines>(*containing_block->paintable_box()))
return;
static_cast<Painting::PaintableWithLines const&>(*containing_block->paint_box()).for_each_fragment([&](auto& fragment) {
static_cast<Painting::PaintableWithLines const&>(*containing_block->paintable_box()).for_each_fragment([&](auto& fragment) {
if (&fragment.layout_node() == this || is_ancestor_of(fragment.layout_node())) {
browsing_context().set_needs_display(fragment.absolute_rect());
}
@ -208,12 +208,12 @@ void Node::set_needs_display()
CSSPixelPoint Node::box_type_agnostic_position() const
{
if (is<Box>(*this))
return verify_cast<Box>(*this).paint_box()->absolute_position();
return verify_cast<Box>(*this).paintable_box()->absolute_position();
VERIFY(is_inline());
CSSPixelPoint position;
if (auto* block = containing_block()) {
if (is<Painting::PaintableWithLines>(*block)) {
static_cast<Painting::PaintableWithLines const&>(*block->paint_box()).for_each_fragment([&](auto& fragment) {
static_cast<Painting::PaintableWithLines const&>(*block->paintable_box()).for_each_fragment([&](auto& fragment) {
if (&fragment.layout_node() == this || is_ancestor_of(fragment.layout_node())) {
position = fragment.absolute_rect().location();
return IterationDecision::Break;

6
Userland/Libraries/LibWeb/Layout/SVGGeometryBox.cpp
View file

@ -43,11 +43,11 @@ Optional<Gfx::AffineTransform> SVGGeometryBox::layout_transform() const
// If the transform (or path) results in a empty box we can't display this.
if (original_bounding_box.is_empty())
return {};
auto scaled_width = paint_box()->content_width().value();
auto scaled_height = paint_box()->content_height().value();
auto scaled_width = paintable_box()->content_width().value();
auto scaled_height = paintable_box()->content_height().value();
scaling = min(scaled_width / original_bounding_box.width(), scaled_height / original_bounding_box.height());
auto scaled_bounding_box = original_bounding_box.scaled(scaling, scaling);
paint_offset = (paint_box()->absolute_rect().location() - svg_box->paint_box()->absolute_rect().location()).to_type<float>() - scaled_bounding_box.location();
paint_offset = (paintable_box()->absolute_rect().location() - svg_box->paint_box()->absolute_rect().location()).to_type<float>() - scaled_bounding_box.location();
}
return Gfx::AffineTransform {}.translate(paint_offset).scale(scaling, scaling).translate(-origin).multiply(transform);
}

10
Userland/Libraries/LibWeb/Layout/Viewport.cpp
View file

@ -36,16 +36,16 @@ void Viewport::build_stacking_context_tree()
const_cast<Painting::PaintableWithLines*>(paint_box())->set_stacking_context(make<Painting::StackingContext>(*this, nullptr));
for_each_in_subtree_of_type<Box>([&](Box& box) {
if (!box.paint_box())
if (!box.paintable_box())
return IterationDecision::Continue;
const_cast<Painting::PaintableBox*>(box.paint_box())->invalidate_stacking_context();
const_cast<Painting::PaintableBox*>(box.paintable_box())->invalidate_stacking_context();
if (!box.establishes_stacking_context()) {
VERIFY(!box.paint_box()->stacking_context());
VERIFY(!box.paintable_box()->stacking_context());
return IterationDecision::Continue;
}
auto* parent_context = const_cast<Painting::PaintableBox*>(box.paint_box())->enclosing_stacking_context();
auto* parent_context = const_cast<Painting::PaintableBox*>(box.paintable_box())->enclosing_stacking_context();
VERIFY(parent_context);
const_cast<Painting::PaintableBox*>(box.paint_box())->set_stacking_context(make<Painting::StackingContext>(box, parent_context));
const_cast<Painting::PaintableBox*>(box.paintable_box())->set_stacking_context(make<Painting::StackingContext>(box, parent_context));
return IterationDecision::Continue;
});