xcb: Move cairo_xcb_picture_t to cairo-xcb-private.h

The next commit will make cairo-xcb-screen.c use this struct and add new
members. Splitting off the move into its own commits makes that easier to
understand.

Signed-off-by: Uli Schlachter <psychon@znc.in>

2 files changed, 20 insertions, 19 deletions

diff --git a/src/cairo-xcb-private.h b/src/cairo-xcb-private.h
index 45b7bbee..82e05c3c 100644
--- a/src/cairo-xcb-private.h
+++ b/src/cairo-xcb-private.h
@@ -63,6 +63,7 @@ typedef struct _cairo_xcb_connection cairo_xcb_connection_t;
 typedef struct _cairo_xcb_font cairo_xcb_font_t;
 typedef struct _cairo_xcb_screen cairo_xcb_screen_t;
 typedef struct _cairo_xcb_surface cairo_xcb_surface_t;
+typedef struct _cairo_xcb_picture cairo_xcb_picture_t;
 typedef struct _cairo_xcb_shm_mem_pool cairo_xcb_shm_mem_pool_t;
 typedef struct _cairo_xcb_shm_info cairo_xcb_shm_info_t;
 
@@ -105,6 +106,25 @@ struct _cairo_xcb_surface {
     cairo_list_t link;
 };
 
+struct _cairo_xcb_picture {
+    cairo_surface_t base;
+
+    cairo_xcb_screen_t *screen;
+    xcb_render_picture_t picture;
+    xcb_render_pictformat_t xrender_format;
+    pixman_format_code_t pixman_format;
+
+    int width, height;
+
+    cairo_extend_t extend;
+    cairo_filter_t filter;
+    cairo_bool_t has_component_alpha;
+    xcb_render_transform_t transform;
+
+    int x0, y0;
+    int x, y;
+};
+
 #if CAIRO_HAS_XLIB_XCB_FUNCTIONS
 typedef struct _cairo_xlib_xcb_surface {
     cairo_surface_t base;
diff --git a/src/cairo-xcb-surface-render.c b/src/cairo-xcb-surface-render.c
index ad7454fb..0c31820c 100644
--- a/src/cairo-xcb-surface-render.c
+++ b/src/cairo-xcb-surface-render.c
@@ -59,25 +59,6 @@
  * extension if it is available.
  */
 
-typedef struct _cairo_xcb_picture {
-    cairo_surface_t base;
-
-    cairo_xcb_screen_t *screen;
-    xcb_render_picture_t picture;
-    xcb_render_pictformat_t xrender_format;
-    pixman_format_code_t pixman_format;
-
-    int width, height;
-
-    cairo_extend_t extend;
-    cairo_filter_t filter;
-    cairo_bool_t has_component_alpha;
-    xcb_render_transform_t transform;
-
-    int x0, y0;
-    int x, y;
-} cairo_xcb_picture_t;
-
 static inline cairo_xcb_connection_t *
 _picture_to_connection (cairo_xcb_picture_t *picture)
 {