michael@0: diff --git a/gfx/cairo/cairo/src/cairo-image-surface.c b/gfx/cairo/cairo/src/cairo-image-surface.c
michael@0: --- a/gfx/cairo/cairo/src/cairo-image-surface.c
michael@0: +++ b/gfx/cairo/cairo/src/cairo-image-surface.c
michael@0: @@ -1788,18 +1788,35 @@ static cairo_status_t
michael@0:  					    cairo_boxes_t *boxes)
michael@0:  {
michael@0:      cairo_boxes_t clear;
michael@0:      cairo_box_t box;
michael@0:      cairo_status_t status;
michael@0:      struct _cairo_boxes_chunk *chunk;
michael@0:      int i;
michael@0:  
michael@0: -    if (boxes->num_boxes < 1 && clip_region == NULL)
michael@0: -	return _cairo_image_surface_fixup_unbounded (dst, extents, NULL);
michael@0: +    // If we have no boxes then we need to clear the entire extents
michael@0: +    // because we have nothing to draw.
michael@0: +    if (boxes->num_boxes < 1 && clip_region == NULL) {
michael@0: +        int x = extents->unbounded.x;
michael@0: +        int y = extents->unbounded.y;
michael@0: +        int width = extents->unbounded.width;
michael@0: +        int height = extents->unbounded.height;
michael@0: +
michael@0: +        pixman_color_t color = { 0 };
michael@0: +        pixman_box32_t box = { x, y, x + width, y + height };
michael@0: +
michael@0: +        if (! pixman_image_fill_boxes (PIXMAN_OP_CLEAR,
michael@0: +                                       dst->pixman_image,
michael@0: +                                       &color,
michael@0: +                                       1, &box)) {
michael@0: +            return _cairo_error (CAIRO_STATUS_NO_MEMORY);
michael@0: +        }
michael@0: +        return CAIRO_STATUS_SUCCESS;
michael@0: +    }
michael@0:  
michael@0:      _cairo_boxes_init (&clear);
michael@0:  
michael@0:      box.p1.x = _cairo_fixed_from_int (extents->unbounded.x + extents->unbounded.width);
michael@0:      box.p1.y = _cairo_fixed_from_int (extents->unbounded.y);
michael@0:      box.p2.x = _cairo_fixed_from_int (extents->unbounded.x);
michael@0:      box.p2.y = _cairo_fixed_from_int (extents->unbounded.y + extents->unbounded.height);
michael@0: