Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-23 12:51:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1892913 - patch 19 - Don't prematurely clear cairo_quartz_image_surface_t's imageSurface field, it still needs to hold a reference to the wrapped image surface. r=gfx-reviewers,lsalzman

Browse Source 
Without this, we end up leaking the DataSourceSurfaceRawData that backs the
quartz image surface created during surface-pattern rendering, because the
imageSurface pointer holds a strong reference and then gets cleared without
releasing it.

Differential Revision: https://phabricator.services.mozilla.com/D209427
This commit is contained in:
Jonathan Kew 2024-05-06 19:25:21 +00:00
parent 335d7f4a1a
commit b3f3abc7e5
2 changed files with 36 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
gfx/cairo/21-quartz-surface-leak.patch Normal file
View File

@ -0,0 +1,30 @@
# HG changeset patch
# User Jonathan Kew <jkew@mozilla.com>
# Date 1714678834 -3600
# Thu May 02 20:40:34 2024 +0100
# Node ID 92c20a5fcddecdc04b4c05ecbfa7fcc64e78ea4e
# Parent 7378b3133191c988cfd1bd3e3f2b615140d79d33
Bug 1892913 - patch 19 - Don't prematurely clear cairo_quartz_image_surface_t's imageSurface field, it still needs to hold a reference to the wrapped image surface.
Without this, we end up leaking the DataSourceSurfaceRawData that backs the
quartz image surface created during surface-pattern rendering, because the
imageSurface pointer holds a strong reference and then gets cleared without
releasing it.
diff --git a/gfx/cairo/cairo/src/cairo-quartz-surface.c b/gfx/cairo/cairo/src/cairo-quartz-surface.c
--- a/gfx/cairo/cairo/src/cairo-quartz-surface.c
+++ b/gfx/cairo/cairo/src/cairo-quartz-surface.c
@@ -759,7 +759,12 @@ static cairo_status_t
if (acquired) {
_cairo_surface_release_source_image (source, image_surface->imageSurface, image_extra);
- image_surface->imageSurface = NULL;
+ /* If source itself is an image surface, _cairo_surface_release_source_image
+ does not release it, and image_surface->imageSurface still owns a reference
+ to it. So we don't clear that field here; _cairo_quartz_image_surface_finish
+ will take care of it. */
+ if (source->type != CAIRO_SURFACE_TYPE_IMAGE)
+ image_surface->imageSurface = NULL;
}
cairo_surface_destroy (&image_surface->base);

7
gfx/cairo/cairo/src/cairo-quartz-surface.c
View File

@ -759,7 +759,12 @@ _cairo_surface_to_cgimage (cairo_surface_t *source,
if (acquired) {
_cairo_surface_release_source_image (source, image_surface->imageSurface, image_extra);
image_surface->imageSurface = NULL;
/* If source itself is an image surface, _cairo_surface_release_source_image
does not release it, and image_surface->imageSurface still owns a reference
to it. So we don't clear that field here; _cairo_quartz_image_surface_finish
will take care of it. */
if (source->type != CAIRO_SURFACE_TYPE_IMAGE)
image_surface->imageSurface = NULL;
}
cairo_surface_destroy (&image_surface->base);