mirror of
https://github.com/RGBCube/serenity
synced 2025-07-25 04:07:44 +00:00
LibGfx+LibWeb: Move Gfx::ScaledFont caching from LibWeb into LibGfx
Before this change, we would only cache and reuse Gfx::ScaledFont instances for downloaded CSS fonts. By moving it into Gfx::VectorFont, we get caching for all vector fonts, including local system TTFs etc. This avoids a *lot* of style invalidations in LibWeb, since we now vend the same Gfx::Font pointer for the same font when used repeatedly.
This commit is contained in:
parent
bf8107b247
commit
f900957d26
16 changed files with 54 additions and 137 deletions
31
Userland/Libraries/LibGfx/Font/VectorFont.cpp
Normal file
31
Userland/Libraries/LibGfx/Font/VectorFont.cpp
Normal file
|
@ -0,0 +1,31 @@
|
|||
/*
|
||||
* Copyright (c) 2023, Andreas Kling <kling@serenityos.org>
|
||||
*
|
||||
* SPDX-License-Identifier: BSD-2-Clause
|
||||
*/
|
||||
|
||||
#include <LibGfx/Font/ScaledFont.h>
|
||||
#include <LibGfx/Font/VectorFont.h>
|
||||
|
||||
namespace Gfx {
|
||||
|
||||
VectorFont::VectorFont() = default;
|
||||
VectorFont::~VectorFont() = default;
|
||||
|
||||
NonnullRefPtr<ScaledFont> VectorFont::scaled_font(float point_size) const
|
||||
{
|
||||
auto it = m_scaled_fonts.find(point_size);
|
||||
if (it != m_scaled_fonts.end())
|
||||
return *it->value;
|
||||
|
||||
// FIXME: It might be nice to have a global cap on the number of fonts we cache
|
||||
// instead of doing it at the per-VectorFont level like this.
|
||||
constexpr size_t max_cached_font_size_count = 128;
|
||||
if (m_scaled_fonts.size() > max_cached_font_size_count)
|
||||
m_scaled_fonts.remove(m_scaled_fonts.begin());
|
||||
|
||||
auto scaled_font = adopt_ref(*new ScaledFont(*this, point_size, point_size));
|
||||
m_scaled_fonts.set(point_size, scaled_font);
|
||||
return scaled_font;
|
||||
}
|
||||
}
|
Loading…
Add table
Add a link
Reference in a new issue