summaryrefslogtreecommitdiff
path: root/vcl/inc
diff options
context:
space:
mode:
authorJan-Marek Glogowski <jan-marek.glogowski@extern.cib.de>2019-11-16 02:21:26 +0000
committerJan-Marek Glogowski <glogow@fbihome.de>2019-11-19 12:47:51 +0100
commit325005697155853891ce4f23e7349931e748d7e7 (patch)
tree35c830a53041079fcb009496bd9129778f54165c /vcl/inc
parentaac19da146d19033964d7c6ed608cfc4786f88c5 (diff)
tdf#128434 try garbage collect ImplFontCache fonts
Instead of changing the harfbuzz caching, for this use case it's enough to queue all per-OutputDevice fonts for garbage collection (GC), which are managed by the OutputDevices ImplFontCache. So just try to GC all the fonts in the ImplFontCache destructor. There is no point keeping these LogicalFontInstances alive, after the OutputDevice font cache is destroyed, as these fonts aren't shared and can't be accessed later. But the main problem is still some correct accounting of harfbuzz resources and eventual even the Freetype ones, so this cleanup would not really be needed. AFAI can tell, this plugs the remaining per-document leaks of the PDF generation, except for a 72 byte basic listener leak from: basic::ImplRepository::impl_createManagerForModel(...) basicmanagerrepository.cxx:480 Change-Id: I3155be59a2bdcd85e01f6f048b990db04d88c94f Reviewed-on: https://gerrit.libreoffice.org/82968 Tested-by: Jenkins Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de> (cherry picked from commit e6aac0b637d583d3cfb893276f813ff5aa1ade17) Reviewed-on: https://gerrit.libreoffice.org/83148
Diffstat (limited to 'vcl/inc')
-rw-r--r--vcl/inc/unx/glyphcache.hxx13
1 files changed, 13 insertions, 0 deletions
diff --git a/vcl/inc/unx/glyphcache.hxx b/vcl/inc/unx/glyphcache.hxx
index 797890a2a345..f369952faac4 100644
--- a/vcl/inc/unx/glyphcache.hxx
+++ b/vcl/inc/unx/glyphcache.hxx
@@ -90,6 +90,19 @@ public:
FreetypeFont* CacheFont(LogicalFontInstance* pFontInstance);
void UncacheFont( FreetypeFont& );
+
+ /** Try to GarbageCollect an explicit logical font
+ *
+ * This should just be called from the ~ImplFontCache destructor, which holds the mapping of the
+ * FontSelectPattern to the LogicalFontInstance per OutputDevice. All other users should just
+ * call CacheFont and UncacheFont correctly. When the ImplFontCache is destroyed with its
+ * OutputDevice, we can safely garbage collection its unused entries, as these can't be reused.
+ *
+ * It's always safe to call this, as it just ignores the used bytes when considering a font for
+ * garbage collection, which normally keeps unreferenced fonts alive.
+ **/
+ void TryGarbageCollectFont(LogicalFontInstance*);
+
void ClearFontCache();
void ClearFontOptions();