summaryrefslogtreecommitdiff
path: root/src/cairo-xlib-surface-private.h
diff options
context:
space:
mode:
authorBenjamin Otte <otte@redhat.com>2010-04-18 23:20:02 +0200
committerBenjamin Otte <otte@redhat.com>2010-04-18 23:20:02 +0200
commitf74ad37e66bbdcc4d727ed6d931dde870d84c2f4 (patch)
tree0d98ce93eb5e38dcf55e230e40d877c7fe3fbd03 /src/cairo-xlib-surface-private.h
parent2bffa2467ed67517419e425fc34fb5b8294a9e96 (diff)
downloadcairo-f74ad37e66bbdcc4d727ed6d931dde870d84c2f4.tar.gz
xlib: Make display a cairo_device_t
The code now uses the locking of the cairo_device_t instead of its own mutexes. The code was modified so that cairo_surface_t does no longer reference the display directly. Instead, it calls _cairo_xlib_display_acquire(). If a function assumes an already acquired display, it now requires the caller to provide a cairo_xlib_display_t parameter. Functions that do not require an acquired display will not require the display parameter or they will take the cairo_device_t instead.
Diffstat (limited to 'src/cairo-xlib-surface-private.h')
-rw-r--r--src/cairo-xlib-surface-private.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/cairo-xlib-surface-private.h b/src/cairo-xlib-surface-private.h
index b30848d57..8309246f5 100644
--- a/src/cairo-xlib-surface-private.h
+++ b/src/cairo-xlib-surface-private.h
@@ -44,8 +44,6 @@ typedef struct _cairo_xlib_surface cairo_xlib_surface_t;
struct _cairo_xlib_surface {
cairo_surface_t base;
- Display *dpy;
- cairo_xlib_display_t *display;
cairo_xlib_screen_t *screen;
cairo_xlib_hook_t close_display_hook;