diff options
| author | Luboš Luňák <l.lunak@collabora.com> | 2022-05-01 19:14:50 +0200 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@collabora.com> | 2022-05-02 15:06:26 +0200 |
| commit | 8e6ab6502278702499e7468404d1010069176578 (patch) | |
| tree | 678b55b91894c5b57728f84ba3da9794fd7f8b43 /vcl | |
| parent | bc7ea0a75911a782c0008be64508cbf3e0d74cc3 (diff) | |
better cache size limit for SalLayoutGlyphsCache
With just limit on the number of cached SalLayoutGlyphs instances
the actual memory used could vary wildly depending on how long
the text is.
Change-Id: Ibcf6918e562e81276d21876c532838996e275bd6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133673
Tested-by: Jenkins
Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/gdi/impglyphitem.cxx | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/vcl/source/gdi/impglyphitem.cxx b/vcl/source/gdi/impglyphitem.cxx index 0ae4e979e141..769c1afb9743 100644 --- a/vcl/source/gdi/impglyphitem.cxx +++ b/vcl/source/gdi/impglyphitem.cxx @@ -24,6 +24,7 @@ #include <tools/stream.hxx> #include <TextLayoutCache.hxx> #include <config_fuzzers.h> +#include <officecfg/Office/Common.hxx> // These need being explicit because of SalLayoutGlyphsImpl being private in vcl. SalLayoutGlyphs::SalLayoutGlyphs() {} @@ -208,7 +209,8 @@ bool SalLayoutGlyphsImpl::IsValid() const SalLayoutGlyphsCache* SalLayoutGlyphsCache::self() { - static vcl::DeleteOnDeinit<SalLayoutGlyphsCache> cache(1000); + static vcl::DeleteOnDeinit<SalLayoutGlyphsCache> cache( + officecfg::Office::Common::Cache::Font::GlyphsCacheSize::get()); return cache.get(); } @@ -419,4 +421,19 @@ inline bool SalLayoutGlyphsCache::CachedGlyphsKey::operator==(const CachedGlyphs // Slower things last in the comparison. } +size_t SalLayoutGlyphsCache::GlyphsCost::operator()(const SalLayoutGlyphs& glyphs) const +{ + size_t cost = 0; + for (int level = 0;; ++level) + { + const SalLayoutGlyphsImpl* impl = glyphs.Impl(level); + if (impl == nullptr) + break; + // Count size in bytes, both the SalLayoutGlyphsImpl instance and contained GlyphItem's. + cost += sizeof(*impl); + cost += impl->size() * sizeof(impl->front()); + } + return cost; +} + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |