The Tor Browser / file comparison
comparison: gfx/cairo/quartz-check-imageSurfaceEquiv.patch
gfx/cairo/quartz-check-imageSurfaceEquiv.patch
- branch
- TOR_BUG_9701
- changeset 15
- b8a032363ba2
equal
deleted
inserted
replaced
| -1:000000000000 | 0:5397487a8e5f |
|---|---|
| 1 From: Daniel Holbert <dholbert@cs.stanford.edu> | |
| 2 Bug 612662 patch 3: Drop cairo_quartz_surface_t's "imageSurfaceEquiv" member if we fail to create it. r=roc a=blocking-final+ | |
| 3 | |
| 4 diff --git a/gfx/cairo/cairo/src/cairo-quartz-surface.c b/gfx/cairo/cairo/src/cairo-quartz-surface.c | |
| 5 --- a/gfx/cairo/cairo/src/cairo-quartz-surface.c | |
| 6 +++ b/gfx/cairo/cairo/src/cairo-quartz-surface.c | |
| 7 @@ -3152,17 +3152,28 @@ cairo_quartz_surface_create (cairo_forma | |
| 8 if (surf->base.status) { | |
| 9 CGContextRelease (cgc); | |
| 10 free (imageData); | |
| 11 // create_internal will have set an error | |
| 12 return (cairo_surface_t*) surf; | |
| 13 } | |
| 14 | |
| 15 surf->imageData = imageData; | |
| 16 - surf->imageSurfaceEquiv = cairo_image_surface_create_for_data (imageData, format, width, height, stride); | |
| 17 + | |
| 18 + cairo_surface_t* tmpImageSurfaceEquiv = | |
| 19 + cairo_image_surface_create_for_data (imageData, format, | |
| 20 + width, height, stride); | |
| 21 + | |
| 22 + if (cairo_surface_status (tmpImageSurfaceEquiv)) { | |
| 23 + // Tried & failed to create an imageSurfaceEquiv! | |
| 24 + cairo_surface_destroy (tmpImageSurfaceEquiv); | |
| 25 + surf->imageSurfaceEquiv = NULL; | |
| 26 + } else { | |
| 27 + surf->imageSurfaceEquiv = tmpImageSurfaceEquiv; | |
| 28 + } | |
| 29 | |
| 30 return (cairo_surface_t *) surf; | |
| 31 } | |
| 32 | |
| 33 /** | |
| 34 * cairo_quartz_surface_get_cg_context | |
| 35 * @surface: the Cairo Quartz surface | |
| 36 * |
