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

LibWeb: Move border corner bitmap getter/cache to function

Browse source 
This will allow the same bitmap to be shared between border,
background, and various other corner clipping code.
This commit is contained in:
MacDue 2022-06-15 21:13:44 +01:00 • committed by Linus Groh
parent 81a3ec0692
commit 4dfbbd5965
2 changed files with 32 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

51
Userland/Libraries/LibWeb/Painting/BorderPainting.cpp
View file

@ -204,6 +204,31 @@ void paint_border(PaintContext& context, BorderEdge edge, Gfx::IntRect const& re
}
}
RefPtr<Gfx::Bitmap> get_cached_corner_bitmap(Gfx::IntSize const& corners_size)
{
auto allocate_mask_bitmap = [&]() -> RefPtr<Gfx::Bitmap> {
auto bitmap = Gfx::Bitmap::try_create(Gfx::BitmapFormat::BGRA8888, corners_size);
if (!bitmap.is_error())
return bitmap.release_value();
return nullptr;
};
// FIXME: Allocate per page?
static thread_local auto corner_bitmap = allocate_mask_bitmap();
// Only reallocate the corner bitmap is the existing one is too small.
// (should mean no more allocations after the first paint -- amortised zero allocations :^))
if (corner_bitmap && corner_bitmap->rect().size().contains(corners_size)) {
Gfx::Painter painter { *corner_bitmap };
painter.clear_rect({ { 0, 0 }, corners_size }, Gfx::Color());
} else {
corner_bitmap = allocate_mask_bitmap();
if (!corner_bitmap) {
dbgln("Failed to allocate corner bitmap with size {}", corners_size);
return nullptr;
}
}
return corner_bitmap;
}
void paint_all_borders(PaintContext& context, Gfx::FloatRect const& bordered_rect, BorderRadiiData const& border_radii_data, BordersData const& borders_data)
{
if (borders_data.top.width <= 0 && borders_data.right.width <= 0 && borders_data.left.width <= 0 && borders_data.bottom.width <= 0)
@ -289,29 +314,11 @@ void paint_all_borders(PaintContext& context, Gfx::FloatRect const& bordered_rec
top_left.vertical_radius + bottom_left.vertical_radius + expand_width,
top_right.vertical_radius + bottom_right.vertical_radius + expand_height)
};
auto allocate_mask_bitmap = [&]() -> RefPtr<Gfx::Bitmap> {
auto bitmap = Gfx::Bitmap::try_create(Gfx::BitmapFormat::BGRA8888, corner_mask_rect.size());
if (!bitmap.is_error())
return bitmap.release_value();
return nullptr;
};
static thread_local auto corner_bitmap = allocate_mask_bitmap();
// Only reallocate the corner bitmap is the existing one is too small.
// (should mean no more allocations after the first paint -- amortised zero allocations :^))
Gfx::Painter painter = ({
Optional<Gfx::Painter> painter;
if (corner_bitmap && corner_bitmap->rect().contains(corner_mask_rect)) {
painter = Gfx::Painter { *corner_bitmap };
painter->clear_rect(corner_mask_rect, Gfx::Color());
} else {
corner_bitmap = allocate_mask_bitmap();
if (!corner_bitmap)
return dbgln("Failed to allocate border corner bitmap with size {}", corner_mask_rect.size());
painter = Gfx::Painter { *corner_bitmap };
}
*painter;
});
auto corner_bitmap = get_cached_corner_bitmap(corner_mask_rect.size());
if (!corner_bitmap)
return;
Gfx::Painter painter { *corner_bitmap };
Gfx::AntiAliasingPainter aa_painter { painter };

3
Userland/Libraries/LibWeb/Painting/BorderPainting.h
View file

@ -56,6 +56,9 @@ struct BordersData {
CSS::BorderData bottom;
CSS::BorderData left;
};
RefPtr<Gfx::Bitmap> get_cached_corner_bitmap(Gfx::IntSize const& corners_size);
void paint_border(PaintContext& context, BorderEdge edge, Gfx::IntRect const& rect, BorderRadiiData const& border_radii_data, BordersData const& borders_data);
void paint_all_borders(PaintContext& context, Gfx::FloatRect const& bordered_rect, BorderRadiiData const& border_radii_data, BordersData const&);