Skip to content

Commit 38ca745

Browse files
kalenikaliaksandrgmta
authored andcommitted
LibWeb: Delete CanvasPaintable::layout_box()
No need for this method when we could reach into DOM node directly from Paintable.
1 parent d3f40e9 commit 38ca745

File tree

2 files changed

+4
-12
lines changed

2 files changed

+4
-12
lines changed

Libraries/LibWeb/Painting/CanvasPaintable.cpp

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,6 @@ CanvasPaintable::CanvasPaintable(Layout::CanvasBox const& layout_box)
2121
{
2222
}
2323

24-
Layout::CanvasBox const& CanvasPaintable::layout_box() const
25-
{
26-
return static_cast<Layout::CanvasBox const&>(layout_node());
27-
}
28-
2924
void CanvasPaintable::paint(DisplayListRecordingContext& context, PaintPhase phase) const
3025
{
3126
if (!is_visible())
@@ -37,13 +32,12 @@ void CanvasPaintable::paint(DisplayListRecordingContext& context, PaintPhase pha
3732
auto canvas_rect = context.rounded_device_rect(absolute_rect());
3833
ScopedCornerRadiusClip corner_clip { context, canvas_rect, normalized_border_radii_data(ShrinkRadiiForBorders::Yes) };
3934

40-
if (layout_box().dom_node().surface()) {
41-
auto surface = layout_box().dom_node().surface();
42-
35+
auto& canvas_element = as<HTML::HTMLCanvasElement>(*dom_node());
36+
if (auto surface = canvas_element.surface()) {
4337
// FIXME: Remove this const_cast.
44-
const_cast<HTML::HTMLCanvasElement&>(layout_box().dom_node()).present();
38+
const_cast<HTML::HTMLCanvasElement&>(canvas_element).present();
4539
auto scaling_mode = to_gfx_scaling_mode(computed_values().image_rendering(), surface->rect(), canvas_rect.to_type<int>());
46-
context.display_list_recorder().draw_painting_surface(canvas_rect.to_type<int>(), *layout_box().dom_node().surface(), surface->rect(), scaling_mode);
40+
context.display_list_recorder().draw_painting_surface(canvas_rect.to_type<int>(), *surface, surface->rect(), scaling_mode);
4741
}
4842
}
4943
}

Libraries/LibWeb/Painting/CanvasPaintable.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@ class CanvasPaintable final : public PaintableBox {
2020

2121
virtual void paint(DisplayListRecordingContext&, PaintPhase) const override;
2222

23-
Layout::CanvasBox const& layout_box() const;
24-
2523
private:
2624
CanvasPaintable(Layout::CanvasBox const&);
2725
};

0 commit comments

Comments
 (0)