michael@0: changeset:   93076:25d0c8a38d7d
michael@0: tag:         none
michael@0: tag:         qbase
michael@0: tag:         qtip
michael@0: tag:         tip
michael@0: user:        Jeff Muizelaar <jmuizelaar@mozilla.com>
michael@0: date:        Thu May 03 15:21:52 2012 -0400
michael@0: summary:     Bug 751668. Avoid incorrectly using EXTEND_NONE. r=joe
michael@0: 
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: @@ -1390,25 +1390,16 @@ static pixman_image_t *
michael@0:  	cairo_image_surface_t *source = (cairo_image_surface_t *) pattern->surface;
michael@0:  	cairo_surface_type_t type;
michael@0:  
michael@0:  	if (source->base.backend->type == CAIRO_INTERNAL_SURFACE_TYPE_SNAPSHOT)
michael@0:  	    source = (cairo_image_surface_t *) ((cairo_surface_snapshot_t *) pattern->surface)->target;
michael@0:  
michael@0:  	type = source->base.backend->type;
michael@0:  	if (type == CAIRO_SURFACE_TYPE_IMAGE) {
michael@0: -	    if (extend != CAIRO_EXTEND_NONE &&
michael@0: -		sample.x >= 0 &&
michael@0: -		sample.y >= 0 &&
michael@0: -		sample.x + sample.width  <= source->width &&
michael@0: -		sample.y + sample.height <= source->height)
michael@0: -	    {
michael@0: -		extend = CAIRO_EXTEND_NONE;
michael@0: -	    }
michael@0: -
michael@0:  	    if (sample.width == 1 && sample.height == 1) {
michael@0:  		if (sample.x < 0 ||
michael@0:  		    sample.y < 0 ||
michael@0:  		    sample.x >= source->width ||
michael@0:  		    sample.y >= source->height)
michael@0:  		{
michael@0:  		    if (extend == CAIRO_EXTEND_NONE)
michael@0:  			return _pixman_transparent_image ();
michael@0: