michael@0: changeset: 42958:dd0f1f0a96b3 michael@0: user: Robert O'Callahan michael@0: date: Tue Jun 01 11:33:05 2010 +1200 michael@0: summary: Bug 568189. Part 3: Remove snapshot backend function since it doesn't work and we may as well just fall back. r=jrmuizel 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: @@ -1993,33 +1993,16 @@ _cairo_quartz_surface_acquire_source_ima michael@0: if (status) michael@0: return _cairo_error (CAIRO_STATUS_NO_MEMORY); michael@0: michael@0: *image_extra = NULL; michael@0: michael@0: return CAIRO_STATUS_SUCCESS; michael@0: } michael@0: michael@0: -static cairo_surface_t * michael@0: -_cairo_quartz_surface_snapshot (void *abstract_surface) michael@0: -{ michael@0: - cairo_int_status_t status; michael@0: - cairo_quartz_surface_t *surface = abstract_surface; michael@0: - cairo_image_surface_t *image; michael@0: - michael@0: - if (surface->imageSurfaceEquiv) michael@0: - return NULL; michael@0: - michael@0: - status = _cairo_quartz_get_image (surface, &image); michael@0: - if (unlikely (status)) michael@0: - return _cairo_surface_create_in_error (CAIRO_STATUS_NO_MEMORY); michael@0: - michael@0: - return &image->base; michael@0: -} michael@0: - michael@0: static void michael@0: _cairo_quartz_surface_release_source_image (void *abstract_surface, michael@0: cairo_image_surface_t *image, michael@0: void *image_extra) michael@0: { michael@0: cairo_surface_destroy ((cairo_surface_t *) image); michael@0: } michael@0: michael@0: @@ -2916,17 +2899,17 @@ static const struct _cairo_surface_backe michael@0: _cairo_quartz_surface_stroke, michael@0: _cairo_quartz_surface_fill, michael@0: #if CAIRO_HAS_QUARTZ_FONT michael@0: _cairo_quartz_surface_show_glyphs, michael@0: #else michael@0: NULL, /* show_glyphs */ michael@0: #endif michael@0: michael@0: - _cairo_quartz_surface_snapshot, michael@0: + NULL, /* snapshot */ michael@0: NULL, /* is_similar */ michael@0: NULL /* fill_stroke */ michael@0: }; michael@0: michael@0: cairo_quartz_surface_t * michael@0: _cairo_quartz_surface_create_internal (CGContextRef cgContext, michael@0: cairo_content_t content, michael@0: unsigned int width, michael@0: