Attachment 157915 Details for Bug 243811 – Avoid deferring resource cleanup for application drawables

[patch] Avoid deferring resource cleanup for application drawables

xlib-dpy-xerror.patch (text/plain), 3.61 KB, created by Chris Wilson on 2007-06-26 16:55:32 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Wilson

Created: 2007-06-26 16:55:32 UTC

Size: 3.61 KB

patch

obsolete

>diff --git a/src/cairo-xlib-display.c b/src/cairo-xlib-display.c
>index 5de9011..c7c3c43 100644
>--- a/src/cairo-xlib-display.c
>+++ b/src/cairo-xlib-display.c
>@@ -405,6 +405,7 @@ void
> _cairo_xlib_display_notify (cairo_xlib_display_t *display)
> {
>     cairo_xlib_job_t *jobs, *job, *freelist;
>+    Display *dpy = display->display;
> 
>     CAIRO_MUTEX_LOCK (display->mutex);
>     jobs = display->workqueue;
>@@ -428,14 +429,13 @@ _cairo_xlib_display_notify (cairo_xlib_display_t *display)
> 
> 	    switch (job->type){
> 	    case WORK:
>-		job->func.work.notify (display->display, job->func.work.data);
>+		job->func.work.notify (dpy, job->func.work.data);
> 		if (job->func.work.destroy != NULL)
> 		    job->func.work.destroy (job->func.work.data);
> 		break;
> 
> 	    case RESOURCE:
>-		job->func.resource.notify (display->display,
>-			                   job->func.resource.xid);
>+		job->func.resource.notify (dpy, job->func.resource.xid);
> 		break;
> 	    }
> 	} while (jobs != NULL);
>diff --git a/src/cairo-xlib-surface.c b/src/cairo-xlib-surface.c
>index db5c155..e593ba2 100644
>--- a/src/cairo-xlib-surface.c
>+++ b/src/cairo-xlib-surface.c
>@@ -273,30 +273,29 @@ _cairo_xlib_surface_finish (void *abstract_surface)
> 				    NULL;
>     cairo_status_t        status  = CAIRO_STATUS_SUCCESS;
> 
>-    if (surface->dst_picture != None) {
>+    if (surface->owns_pixmap) {
> 	cairo_status_t status2;
>-	status2 = _cairo_xlib_display_queue_resource (display,
>-		                                      XRenderFreePicture,
>-						      surface->dst_picture);
>-	if (status2 == CAIRO_STATUS_SUCCESS)
>-	    surface->dst_picture = None;
>-	else if (status == CAIRO_STATUS_SUCCESS)
>-	    status = status2;
>-    }
> 
>-    if (surface->src_picture != None) {
>-	cairo_status_t status2;
>-	status2 = _cairo_xlib_display_queue_resource (display,
>-		                                      XRenderFreePicture,
>-						      surface->src_picture);
>-	if (status2 == CAIRO_STATUS_SUCCESS)
>-	    surface->src_picture = None;
>-	else if (status == CAIRO_STATUS_SUCCESS)
>-	    status = status2;
>-    }
>+	if (surface->dst_picture != None) {
>+	    status2 = _cairo_xlib_display_queue_resource (display,
>+							  XRenderFreePicture,
>+							  surface->dst_picture);
>+	    if (status2 == CAIRO_STATUS_SUCCESS)
>+		surface->dst_picture = None;
>+	    else if (status == CAIRO_STATUS_SUCCESS)
>+		status = status2;
>+	}
>+
>+	if (surface->src_picture != None) {
>+	    status2 = _cairo_xlib_display_queue_resource (display,
>+							  XRenderFreePicture,
>+							  surface->src_picture);
>+	    if (status2 == CAIRO_STATUS_SUCCESS)
>+		surface->src_picture = None;
>+	    else if (status == CAIRO_STATUS_SUCCESS)
>+		status = status2;
>+	}
> 
>-    if (surface->owns_pixmap) {
>-	cairo_status_t status2;
> 	status2 = _cairo_xlib_display_queue_resource (display,
> 		                           (cairo_xlib_notify_resource_func) XFreePixmap,
> 					   surface->drawable);
>@@ -305,8 +304,15 @@ _cairo_xlib_surface_finish (void *abstract_surface)
> 	    surface->drawable = None;
> 	} else if (status == CAIRO_STATUS_SUCCESS)
> 	    status = status2;
>+    } else {
>+	if (surface->dst_picture != None)
>+	    XRenderFreePicture (surface->dpy, surface->dst_picture);
>+
>+	if (surface->src_picture != None)
>+	    XRenderFreePicture (surface->dpy, surface->src_picture);
>     }
> 
>+
>     if (surface->gc != NULL) {
> 	cairo_status_t status2;
> 	status2 = _cairo_xlib_screen_put_gc (surface->screen_info,
>@@ -542,6 +548,7 @@ _get_image_surface (cairo_xlib_surface_t    *surface,
>     {
> 	cairo_xlib_error_func_t old_handler;
> 
>+	/* XXX we should call XSync() here to catch in-flight XErrors */
> 	old_handler = XSetErrorHandler (_noop_error_handler);
> 
> 	ximage = XGetImage (surface->dpy,

Actions: View | Diff

Attachments on bug 243811: 157155 | 157915 | 157916 | 157947