[meta] Rename cairo_meta_surface_t to cairo_recording_surface_t.

The new name is more descriptive than the rather opaque meta surface.
Discussed with vigour on the mailing list and #cairo:

http://lists.cairographics.org/archives/cairo/2009-July/017571.html

1 files changed, 46 insertions, 46 deletions

diff --git a/src/cairo-paginated-surface.c b/src/cairo-paginated-surface.c
index 680bcf530..dff5e8313 100644
--- a/src/cairo-paginated-surface.c
+++ b/src/cairo-paginated-surface.c
@@ -46,7 +46,7 @@
 
 #include "cairo-paginated-private.h"
 #include "cairo-paginated-surface-private.h"
-#include "cairo-meta-surface-private.h"
+#include "cairo-recording-surface-private.h"
 #include "cairo-analysis-surface-private.h"
 
 static const cairo_surface_backend_t cairo_paginated_surface_backend;
@@ -64,26 +64,26 @@ _cairo_paginated_surface_create_similar (void			*abstract_surface,
     rect.x = rect.y = 0.;
     rect.width = width;
     rect.height = height;
-    return cairo_meta_surface_create (content, &rect);
+    return cairo_recording_surface_create (content, &rect);
 }
 
 static cairo_surface_t *
-_create_meta_surface_for_target (cairo_surface_t *target,
-				 cairo_content_t content)
+_create_recording_surface_for_target (cairo_surface_t *target,
+				      cairo_content_t content)
 {
     cairo_rectangle_int_t rect;
 
     if (_cairo_surface_get_extents (target, &rect)) {
-	cairo_rectangle_t meta_extents;
+	cairo_rectangle_t recording_extents;
 
-	meta_extents.x = rect.x;
-	meta_extents.y = rect.y;
-	meta_extents.width = rect.width;
-	meta_extents.height = rect.height;
+	recording_extents.x = rect.x;
+	recording_extents.y = rect.y;
+	recording_extents.width = rect.width;
+	recording_extents.height = rect.height;
 
-	return cairo_meta_surface_create (content, &meta_extents);
+	return cairo_recording_surface_create (content, &recording_extents);
     } else {
-	return cairo_meta_surface_create (content, NULL);
+	return cairo_recording_surface_create (content, NULL);
     }
 }
 
@@ -113,8 +113,8 @@ _cairo_paginated_surface_create (cairo_surface_t				*target,
     surface->content = content;
     surface->backend = backend;
 
-    surface->meta = _create_meta_surface_for_target (target, content);
-    status = surface->meta->status;
+    surface->recording_surface = _create_recording_surface_for_target (target, content);
+    status = surface->recording_surface->status;
     if (unlikely (status))
 	goto FAIL_CLEANUP_SURFACE;
 
@@ -171,10 +171,10 @@ _cairo_paginated_surface_finish (void *abstract_surface)
     }
     cairo_surface_destroy (surface->target);
 
-    cairo_surface_finish (surface->meta);
+    cairo_surface_finish (surface->recording_surface);
     if (status == CAIRO_STATUS_SUCCESS)
-	status = cairo_surface_status (surface->meta);
-    cairo_surface_destroy (surface->meta);
+	status = cairo_surface_status (surface->recording_surface);
+    cairo_surface_destroy (surface->recording_surface);
 
     return status;
 }
@@ -217,7 +217,7 @@ _cairo_paginated_surface_acquire_source_image (void	       *abstract_surface,
 							   extents.width,
 							   extents.height);
 
-    status = _cairo_meta_surface_replay (surface->meta, image);
+    status = _cairo_recording_surface_replay (surface->recording_surface, image);
     if (unlikely (status)) {
 	cairo_surface_destroy (image);
 	return status;
@@ -261,7 +261,7 @@ _paint_fallback_image (cairo_paginated_surface_t *surface,
      * so we have to do the scaling manually. */
     cairo_surface_set_device_offset (image, -x*x_scale, -y*y_scale);
 
-    status = _cairo_meta_surface_replay (surface->meta, image);
+    status = _cairo_recording_surface_replay (surface->recording_surface, image);
     if (unlikely (status))
 	goto CLEANUP_IMAGE;
 
@@ -305,8 +305,8 @@ _paint_page (cairo_paginated_surface_t *surface)
 
     surface->backend->set_paginated_mode (surface->target,
 	                                  CAIRO_PAGINATED_MODE_ANALYZE);
-    status = _cairo_meta_surface_replay_and_create_regions (surface->meta,
-	                                                    analysis);
+    status = _cairo_recording_surface_replay_and_create_regions (surface->recording_surface,
+								 analysis);
     if (status || analysis->status) {
 	if (status == CAIRO_STATUS_SUCCESS)
 	    status = analysis->status;
@@ -356,9 +356,9 @@ _paint_page (cairo_paginated_surface_t *surface)
 	surface->backend->set_paginated_mode (surface->target,
 		                              CAIRO_PAGINATED_MODE_RENDER);
 
-	status = _cairo_meta_surface_replay_region (surface->meta,
-						    surface->target,
-						    CAIRO_META_REGION_NATIVE);
+	status = _cairo_recording_surface_replay_region (surface->recording_surface,
+							 surface->target,
+							 CAIRO_RECORDING_REGION_NATIVE);
 	assert (status != CAIRO_INT_STATUS_UNSUPPORTED);
 	if (unlikely (status))
 	    goto FAIL;
@@ -442,7 +442,7 @@ _cairo_paginated_surface_copy_page (void *abstract_surface)
      * optimization for the output, but the interaction with image
      * fallbacks gets tricky. For now, we just let the target see a
      * show_page and we implement the copying by simply not destroying
-     * the meta-surface. */
+     * the recording-surface. */
 
     cairo_surface_show_page (surface->target);
     return cairo_surface_status (surface->target);
@@ -467,15 +467,15 @@ _cairo_paginated_surface_show_page (void *abstract_surface)
     if (unlikely (status))
 	return status;
 
-    status = surface->meta->status;
+    status = surface->recording_surface->status;
     if (unlikely (status))
 	return status;
 
-    cairo_surface_destroy (surface->meta);
+    cairo_surface_destroy (surface->recording_surface);
 
-    surface->meta = _create_meta_surface_for_target (surface->target,
-						     surface->content);
-    status = surface->meta->status;
+    surface->recording_surface = _create_recording_surface_for_target (surface->target,
+								       surface->content);
+    status = surface->recording_surface->status;
     if (unlikely (status))
 	return status;
 
@@ -517,7 +517,7 @@ _cairo_paginated_surface_paint (void			*abstract_surface,
 
     surface->page_is_blank = FALSE;
 
-    return _cairo_surface_paint (surface->meta, op, source, clip);
+    return _cairo_surface_paint (surface->recording_surface, op, source, clip);
 }
 
 static cairo_int_status_t
@@ -535,7 +535,7 @@ _cairo_paginated_surface_mask (void		*abstract_surface,
 
     surface->page_is_blank = FALSE;
 
-    return _cairo_surface_mask (surface->meta, op, source, mask, clip);
+    return _cairo_surface_mask (surface->recording_surface, op, source, mask, clip);
 }
 
 static cairo_int_status_t
@@ -558,7 +558,7 @@ _cairo_paginated_surface_stroke (void			*abstract_surface,
 
     surface->page_is_blank = FALSE;
 
-    return _cairo_surface_stroke (surface->meta, op, source,
+    return _cairo_surface_stroke (surface->recording_surface, op, source,
 				  path, style,
 				  ctm, ctm_inverse,
 				  tolerance, antialias,
@@ -583,7 +583,7 @@ _cairo_paginated_surface_fill (void			*abstract_surface,
 
     surface->page_is_blank = FALSE;
 
-    return _cairo_surface_fill (surface->meta, op, source,
+    return _cairo_surface_fill (surface->recording_surface, op, source,
 				path, fill_rule,
 				tolerance, antialias,
 				clip);
@@ -598,18 +598,18 @@ _cairo_paginated_surface_has_show_text_glyphs (void *abstract_surface)
 }
 
 static cairo_int_status_t
-_cairo_paginated_surface_show_text_glyphs (void			    *abstract_surface,
-					   cairo_operator_t	     op,
-					   const cairo_pattern_t	    *source,
-					   const char		    *utf8,
-					   int			     utf8_len,
-					   cairo_glyph_t		    *glyphs,
-					   int			     num_glyphs,
+_cairo_paginated_surface_show_text_glyphs (void			      *abstract_surface,
+					   cairo_operator_t	       op,
+					   const cairo_pattern_t      *source,
+					   const char		      *utf8,
+					   int			       utf8_len,
+					   cairo_glyph_t	      *glyphs,
+					   int			       num_glyphs,
 					   const cairo_text_cluster_t *clusters,
-					   int			     num_clusters,
-					   cairo_text_cluster_flags_t cluster_flags,
-					   cairo_scaled_font_t	    *scaled_font,
-					   cairo_clip_t		    *clip)
+					   int			       num_clusters,
+					   cairo_text_cluster_flags_t  cluster_flags,
+					   cairo_scaled_font_t	      *scaled_font,
+					   cairo_clip_t		      *clip)
 {
     cairo_paginated_surface_t *surface = abstract_surface;
 
@@ -619,7 +619,7 @@ _cairo_paginated_surface_show_text_glyphs (void			    *abstract_surface,
 
     surface->page_is_blank = FALSE;
 
-    return _cairo_surface_show_text_glyphs (surface->meta, op, source,
+    return _cairo_surface_show_text_glyphs (surface->recording_surface, op, source,
 					    utf8, utf8_len,
 					    glyphs, num_glyphs,
 					    clusters, num_clusters,
@@ -633,7 +633,7 @@ _cairo_paginated_surface_snapshot (void *abstract_other)
 {
     cairo_paginated_surface_t *other = abstract_other;
 
-    return _cairo_surface_snapshot (other->meta);
+    return _cairo_surface_snapshot (other->recording_surface);
 }
 
 static const cairo_surface_backend_t cairo_paginated_surface_backend = {