From 60fc48e71fa0110fd738449a3f091da42ee8d332 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sat, 20 Jan 2024 07:50:11 -0500 Subject: [PATCH 1/3] gpu: Cosmetics s/timestsamp/timestamp/ --- gsk/gpu/gskgpudevice.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gsk/gpu/gskgpudevice.c b/gsk/gpu/gskgpudevice.c index 0a28e578ec..25386b3ad3 100644 --- a/gsk/gpu/gskgpudevice.c +++ b/gsk/gpu/gskgpudevice.c @@ -48,7 +48,7 @@ struct _GskGpuCachedClass GskGpuCached *cached); gboolean (* should_collect) (GskGpuDevice *device, GskGpuCached *cached, - gint64 timestsamp); + gint64 timestamp); }; struct _GskGpuCached @@ -285,7 +285,7 @@ gsk_gpu_cached_glyph_free (GskGpuDevice *device, static gboolean gsk_gpu_cached_glyph_should_collect (GskGpuDevice *device, GskGpuCached *cached, - gint64 timestsamp) + gint64 timestamp) { /* FIXME */ return FALSE; From c3fcf0f7b0fd036da91fcde869e4e5e98d1f708c Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 19 Jan 2024 16:22:01 -0500 Subject: [PATCH 2/3] gpu: Plug a memory leak This looks like just a leftover line. --- gsk/gpu/gskgpudevice.c | 1 - 1 file changed, 1 deletion(-) diff --git a/gsk/gpu/gskgpudevice.c b/gsk/gpu/gskgpudevice.c index 25386b3ad3..51c009cd7f 100644 --- a/gsk/gpu/gskgpudevice.c +++ b/gsk/gpu/gskgpudevice.c @@ -661,7 +661,6 @@ gsk_gpu_device_lookup_glyph_image (GskGpuDevice *self, return cache->image; } - cache = g_new (GskGpuCachedGlyph, 1); pango_font_get_glyph_extents (font, glyph, &ink_rect, NULL); origin.x = floor (ink_rect.x * scale / PANGO_SCALE); origin.y = floor (ink_rect.y * scale / PANGO_SCALE); From b4b7e9b0408159c86e65f6dd01b1c1a520e2b128 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 19 Jan 2024 11:23:14 -0500 Subject: [PATCH 3/3] gpu: Fix up gc Make the gc loop free the the right item. --- gsk/gpu/gskgpudevice.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gsk/gpu/gskgpudevice.c b/gsk/gpu/gskgpudevice.c index 51c009cd7f..671069590b 100644 --- a/gsk/gpu/gskgpudevice.c +++ b/gsk/gpu/gskgpudevice.c @@ -336,7 +336,7 @@ gsk_gpu_device_gc (GskGpuDevice *self, { next = cached->next; if (gsk_gpu_cached_should_collect (self, cached, timestamp)) - gsk_gpu_cached_free (self, priv->first_cached); + gsk_gpu_cached_free (self, cached); } }