michael@0: From: Daniel Holbert <dholbert@cs.stanford.edu>
michael@0: Bug 612662 patch 3: Drop cairo_quartz_surface_t's "imageSurfaceEquiv" member if we fail to create it. r=roc a=blocking-final+
michael@0: 
michael@0: diff --git a/gfx/cairo/cairo/src/cairo-quartz-surface.c b/gfx/cairo/cairo/src/cairo-quartz-surface.c
michael@0: --- a/gfx/cairo/cairo/src/cairo-quartz-surface.c
michael@0: +++ b/gfx/cairo/cairo/src/cairo-quartz-surface.c
michael@0: @@ -3152,17 +3152,28 @@ cairo_quartz_surface_create (cairo_forma
michael@0:      if (surf->base.status) {
michael@0:  	CGContextRelease (cgc);
michael@0:  	free (imageData);
michael@0:  	// create_internal will have set an error
michael@0:  	return (cairo_surface_t*) surf;
michael@0:      }
michael@0:  
michael@0:      surf->imageData = imageData;
michael@0: -    surf->imageSurfaceEquiv = cairo_image_surface_create_for_data (imageData, format, width, height, stride);
michael@0: +
michael@0: +    cairo_surface_t* tmpImageSurfaceEquiv =
michael@0: +      cairo_image_surface_create_for_data (imageData, format,
michael@0: +                                           width, height, stride);
michael@0: +
michael@0: +    if (cairo_surface_status (tmpImageSurfaceEquiv)) {
michael@0: +        // Tried & failed to create an imageSurfaceEquiv!
michael@0: +        cairo_surface_destroy (tmpImageSurfaceEquiv);
michael@0: +        surf->imageSurfaceEquiv = NULL;
michael@0: +    } else {
michael@0: +        surf->imageSurfaceEquiv = tmpImageSurfaceEquiv;
michael@0: +    }
michael@0:  
michael@0:      return (cairo_surface_t *) surf;
michael@0:  }
michael@0:  
michael@0:  /**
michael@0:   * cairo_quartz_surface_get_cg_context
michael@0:   * @surface: the Cairo Quartz surface
michael@0:   *