Freeze the font cachepixman-surface

1 files changed, 6 insertions, 0 deletions

diff --git a/src/cairo-pixman-surface.c b/src/cairo-pixman-surface.c
index a5add8f4..729791a8 100644
--- a/src/cairo-pixman-surface.c
+++ b/src/cairo-pixman-surface.c
@@ -1596,6 +1596,8 @@ cairo_pixman_surface_glyphs (void			*abstract_surface,
     width = pixman_image_get_width (psurface->pimage);
     height = pixman_image_get_height (psurface->pimage);
 
+    _cairo_scaled_font_freeze_cache (scaled_font);
+
     CAIRO_MUTEX_LOCK (_cairo_glyph_cache_mutex);
 
     glyph_cache = get_glyph_cache();
@@ -1627,9 +1629,11 @@ cairo_pixman_surface_glyphs (void			*abstract_surface,
              * drop the mutex around it.
              */
             CAIRO_MUTEX_UNLOCK (_cairo_glyph_cache_mutex);
+
             status = _cairo_scaled_glyph_lookup (scaled_font, index,
                                                  CAIRO_SCALED_GLYPH_INFO_SURFACE,
                                                  &scaled_glyph);
+
             CAIRO_MUTEX_LOCK (_cairo_glyph_cache_mutex);
 
             if (unlikely (status))
@@ -1662,6 +1666,8 @@ out_thaw:
 
 out_unlock:
     CAIRO_MUTEX_UNLOCK (_cairo_glyph_cache_mutex);
+    _cairo_scaled_font_thaw_cache (scaled_font);
+
     return status;
 }