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

[cairo-pattern] Band-aid for the solid surface cache.

Browse source 
Behdad noticed that the mixing of dissimilar surfaces within the cache
was fubar
(http://lists.cairographics.org/archives/cairo/2008-June/014348.html).

This corrects the dereferencing of the evicted surface, but leaves open
the question of the future of the cache.
This commit is contained in:
Chris Wilson 2008-06-19 11:42:43 +01:00
parent 47d8739ea1
commit 565644e616
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/cairo-pattern.c
View file

@ -1453,9 +1453,10 @@ _cairo_pattern_acquire_surface_for_solid (cairo_solid_pattern_t *pattern,
&pattern->base);
if (status)
goto UNLOCK;
cairo_surface_reference (surface);
} else {
/* Unable to reuse, evict */
cairo_surface_destroy (surface);
surface = NULL;
}
}
@ -1485,6 +1486,7 @@ _cairo_pattern_acquire_surface_for_solid (cairo_solid_pattern_t *pattern,
i = solid_surface_cache.size++;
solid_surface_cache.cache[i].color = pattern->color;
cairo_surface_destroy (solid_surface_cache.cache[i].surface);
solid_surface_cache.cache[i].surface = surface;
DONE:
@ -1513,8 +1515,11 @@ _cairo_pattern_reset_solid_surface_cache (void)
/* remove surfaces starting from the end so that solid_surface_cache.cache
* is always in a consistent state when we release the mutex. */
while (solid_surface_cache.size) {
cairo_surface_t *surface = solid_surface_cache.cache[solid_surface_cache.size-1].surface;
cairo_surface_t *surface;
solid_surface_cache.size--;
surface = solid_surface_cache.cache[solid_surface_cache.size].surface;
solid_surface_cache.cache[solid_surface_cache.size].surface = NULL;
/* release the lock to avoid the possibility of a recursive
* deadlock when the scaled font destroy closure gets called */