AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2025-01-14 06:10:21 +00:00
Code Issues Projects Releases Wiki Activity

gdkwindow: Squash a leak in the subsurface case

Browse Source 
cairo_surface_create_for_rectangle takes a ref on the parent surface,
so we need to drop ours.

Rename get_window_surface to ref_window_surface to make the code more
clear and to stop this error from happening again.
This commit is contained in:
Jasper St. Pierre 2014-06-20 20:47:59 -04:00
parent d619a78aeb
commit 60d39e973a
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
gdk/gdkwindow.c
View File

@ -2984,7 +2984,7 @@ gdk_window_clear_backing_region (GdkWindow *window,
* or the actual impl surface of the window. This should not be used
* from very many places: be careful! */
static cairo_surface_t *
get_window_surface (GdkWindow *window)
ref_window_surface (GdkWindow *window)
{
if (window->impl_window->current_paint.surface)
return cairo_surface_reference (window->impl_window->current_paint.surface);
@ -3002,7 +3002,7 @@ _gdk_window_ref_cairo_surface (GdkWindow *window)
g_return_val_if_fail (GDK_IS_WINDOW (window), NULL);
surface = get_window_surface (window);
surface = ref_window_surface (window);
if (gdk_window_has_impl (window))
{
@ -3010,11 +3010,14 @@ _gdk_window_ref_cairo_surface (GdkWindow *window)
}
else
{
return cairo_surface_create_for_rectangle (surface,
window->abs_x,
window->abs_y,
window->width,
window->height);
cairo_surface_t *subsurface;
subsurface = cairo_surface_create_for_rectangle (surface,
window->abs_x,
window->abs_y,
window->width,
window->height);
cairo_surface_destroy (surface);
return subsurface;
}
}