michael@0: diff --git a/gfx/cairo/cairo/src/cairo-xlib-surface.c b/gfx/cairo/cairo/src/cairo-xlib-surface.c
michael@0: --- a/gfx/cairo/cairo/src/cairo-xlib-surface.c
michael@0: +++ b/gfx/cairo/cairo/src/cairo-xlib-surface.c
michael@0: @@ -4806,30 +4806,30 @@ static cairo_int_status_t
michael@0:      }
michael@0:  
michael@0:      X_DEBUG ((display->display, "show_glyphs (dst=%x)", (unsigned int) dst->drawable));
michael@0:  
michael@0:      if (clip_region != NULL &&
michael@0:  	cairo_region_num_rectangles (clip_region) == 1)
michael@0:      {
michael@0:  	cairo_rectangle_int_t glyph_extents;
michael@0: -	const cairo_rectangle_int_t *clip_extents;
michael@0: +	cairo_rectangle_int_t clip_extents;
michael@0:  
michael@0:  	/* Can we do without the clip?
michael@0:  	 * Around 50% of the time the clip is redundant (firefox).
michael@0:  	 */
michael@0:  	_cairo_scaled_font_glyph_approximate_extents (scaled_font,
michael@0:  						      glyphs, num_glyphs,
michael@0:  						      &glyph_extents);
michael@0:  
michael@0: -	clip_extents = &clip->path->extents;
michael@0: -	if (clip_extents->x <= glyph_extents.x &&
michael@0: -	    clip_extents->y <= glyph_extents.y &&
michael@0: -	    clip_extents->x + clip_extents->width  >= glyph_extents.x + glyph_extents.width &&
michael@0: -	    clip_extents->y + clip_extents->height >= glyph_extents.y + glyph_extents.height)
michael@0: +	cairo_region_get_extents(clip_region, &clip_extents);
michael@0: +	if (clip_extents.x <= glyph_extents.x &&
michael@0: +	    clip_extents.y <= glyph_extents.y &&
michael@0: +	    clip_extents.x + clip_extents.width  >= glyph_extents.x + glyph_extents.width &&
michael@0: +	    clip_extents.y + clip_extents.height >= glyph_extents.y + glyph_extents.height)
michael@0:  	{
michael@0:  	    clip_region = NULL;
michael@0:  	}
michael@0:      }
michael@0:  
michael@0:      status = _cairo_xlib_surface_set_clip_region (dst, clip_region);
michael@0:      if (unlikely (status))
michael@0:          goto BAIL0;