fdo-mirrors/cairo
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/cairo/cairo.git synced 2026-05-03 12:27:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

[cairo-scaled-font] Don't hold onto to a dropped font.

Browse source 
Mark fonts that have been removed from the cache due to an error on a
shared object and do not put them into the holdovers array.
This commit is contained in:
Chris Wilson 2007-10-04 16:16:41 +01:00
parent 6e93941a76
commit 80c06f4539
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/cairo-scaled-font.c
View file

@ -177,8 +177,9 @@ _cairo_scaled_glyph_destroy (void *abstract_glyph)
free (scaled_glyph);
}
#define ZOMBIE 0
const cairo_scaled_font_t _cairo_scaled_font_nil = {
{ 0 }, /* hash_entry */
{ ZOMBIE }, /* hash_entry */
CAIRO_STATUS_NO_MEMORY, /* status */
CAIRO_REFERENCE_COUNT_INVALID, /* ref_count */
{ 0, 0, 0, NULL }, /* user_data */
@ -423,6 +424,7 @@ _cairo_scaled_font_init_key (cairo_scaled_font_t *scaled_font,
hash ^= cairo_font_options_hash (&scaled_font->options);
assert (hash != ZOMBIE);
scaled_font->hash_entry.hash = hash;
}
@ -650,6 +652,7 @@ cairo_scaled_font_create (cairo_font_face_t *font_face,
/* the font has been put into an error status - abandon the cache */
_cairo_hash_table_remove (font_map->hash_table, &key.hash_entry);
scaled_font->hash_entry.hash = ZOMBIE;
}
/* Otherwise create it and insert it into the hash table. */
@ -730,7 +733,8 @@ cairo_scaled_font_destroy (cairo_scaled_font_t *scaled_font)
assert (CAIRO_REFERENCE_COUNT_HAS_REFERENCE (&scaled_font->ref_count));
if (_cairo_reference_count_dec_and_test (&scaled_font->ref_count)) {
if (_cairo_reference_count_dec_and_test (&scaled_font->ref_count)
&& scaled_font->hash_entry.hash != ZOMBIE) {
/* Rather than immediately destroying this object, we put it into
* the font_map->holdovers array in case it will get used again
* soon (and is why we must hold the lock over the atomic op on