gfx/cairo/quartz-remove-snapshot.patch

Thu, 22 Jan 2015 13:21:57 +0100

author
Michael Schloh von Bennewitz <michael@schloh.com>
date
Thu, 22 Jan 2015 13:21:57 +0100
branch
TOR_BUG_9701
changeset 15
b8a032363ba2
permissions
-rw-r--r--

Incorporate requested changes from Mozilla in review:
https://bugzilla.mozilla.org/show_bug.cgi?id=1123480#c6

     1 changeset:   42958:dd0f1f0a96b3
     2 user:        Robert O'Callahan <robert@ocallahan.org>
     3 date:        Tue Jun 01 11:33:05 2010 +1200
     4 summary:     Bug 568189. Part 3: Remove snapshot backend function since it doesn't work and we may as well just fall back. r=jrmuizel
     6 diff --git a/gfx/cairo/cairo/src/cairo-quartz-surface.c b/gfx/cairo/cairo/src/cairo-quartz-surface.c
     7 --- a/gfx/cairo/cairo/src/cairo-quartz-surface.c
     8 +++ b/gfx/cairo/cairo/src/cairo-quartz-surface.c
     9 @@ -1993,33 +1993,16 @@ _cairo_quartz_surface_acquire_source_ima
    10      if (status)
    11  	return _cairo_error (CAIRO_STATUS_NO_MEMORY);
    13      *image_extra = NULL;
    15      return CAIRO_STATUS_SUCCESS;
    16  }
    18 -static cairo_surface_t *
    19 -_cairo_quartz_surface_snapshot (void *abstract_surface)
    20 -{
    21 -    cairo_int_status_t status;
    22 -    cairo_quartz_surface_t *surface = abstract_surface;
    23 -    cairo_image_surface_t *image;
    24 -
    25 -    if (surface->imageSurfaceEquiv)
    26 -	return NULL;
    27 -
    28 -    status = _cairo_quartz_get_image (surface, &image);
    29 -    if (unlikely (status))
    30 -        return _cairo_surface_create_in_error (CAIRO_STATUS_NO_MEMORY);
    31 -
    32 -    return &image->base;
    33 -}
    34 -
    35  static void
    36  _cairo_quartz_surface_release_source_image (void *abstract_surface,
    37  					     cairo_image_surface_t *image,
    38  					     void *image_extra)
    39  {
    40      cairo_surface_destroy ((cairo_surface_t *) image);
    41  }
    43 @@ -2916,17 +2899,17 @@ static const struct _cairo_surface_backe
    44      _cairo_quartz_surface_stroke,
    45      _cairo_quartz_surface_fill,
    46  #if CAIRO_HAS_QUARTZ_FONT
    47      _cairo_quartz_surface_show_glyphs,
    48  #else
    49      NULL, /* show_glyphs */
    50  #endif
    52 -    _cairo_quartz_surface_snapshot,
    53 +    NULL, /* snapshot */
    54      NULL, /* is_similar */
    55      NULL  /* fill_stroke */
    56  };
    58  cairo_quartz_surface_t *
    59  _cairo_quartz_surface_create_internal (CGContextRef cgContext,
    60  					cairo_content_t content,
    61  					unsigned int width,

mercurial