diff options
author | M Joonas Pihlaja <jpihlaja@cc.helsinki.fi> | 2009-10-22 02:13:36 +0300 |
---|---|---|
committer | M Joonas Pihlaja <jpihlaja@cc.helsinki.fi> | 2009-10-22 02:29:47 +0300 |
commit | 43a775f60da57206b194039cd5d8b6a735284c45 (patch) | |
tree | d6336bb46cc3927819c1341900ae80ca54b71abc /src/cairo-analysis-surface.c | |
parent | df357f26ff72571acb840715efa4930054d4fdbe (diff) | |
download | cairo-43a775f60da57206b194039cd5d8b6a735284c45.tar.gz |
[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
Diffstat (limited to 'src/cairo-analysis-surface.c')
-rw-r--r-- | src/cairo-analysis-surface.c | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/src/cairo-analysis-surface.c b/src/cairo-analysis-surface.c index 5faa1b96e..0ba667d4a 100644 --- a/src/cairo-analysis-surface.c +++ b/src/cairo-analysis-surface.c @@ -38,7 +38,7 @@ #include "cairo-analysis-surface-private.h" #include "cairo-paginated-private.h" -#include "cairo-meta-surface-private.h" +#include "cairo-recording-surface-private.h" #include "cairo-region-private.h" typedef struct { @@ -76,9 +76,9 @@ _cairo_analysis_surface_merge_status (cairo_int_status_t status_a, status_b == CAIRO_INT_STATUS_IMAGE_FALLBACK) return CAIRO_INT_STATUS_IMAGE_FALLBACK; - if (status_a == CAIRO_INT_STATUS_ANALYZE_META_SURFACE_PATTERN || - status_b == CAIRO_INT_STATUS_ANALYZE_META_SURFACE_PATTERN) - return CAIRO_INT_STATUS_ANALYZE_META_SURFACE_PATTERN; + if (status_a == CAIRO_INT_STATUS_ANALYZE_RECORDING_SURFACE_PATTERN || + status_b == CAIRO_INT_STATUS_ANALYZE_RECORDING_SURFACE_PATTERN) + return CAIRO_INT_STATUS_ANALYZE_RECORDING_SURFACE_PATTERN; if (status_a == CAIRO_INT_STATUS_FLATTEN_TRANSPARENCY || status_b == CAIRO_INT_STATUS_FLATTEN_TRANSPARENCY) @@ -92,8 +92,8 @@ _cairo_analysis_surface_merge_status (cairo_int_status_t status_a, } static cairo_int_status_t -_analyze_meta_surface_pattern (cairo_analysis_surface_t *surface, - const cairo_pattern_t *pattern) +_analyze_recording_surface_pattern (cairo_analysis_surface_t *surface, + const cairo_pattern_t *pattern) { const cairo_surface_pattern_t *surface_pattern; cairo_bool_t old_has_ctm; @@ -102,7 +102,7 @@ _analyze_meta_surface_pattern (cairo_analysis_surface_t *surface, assert (pattern->type == CAIRO_PATTERN_TYPE_SURFACE); surface_pattern = (const cairo_surface_pattern_t *) pattern; - assert (_cairo_surface_is_meta (surface_pattern->surface)); + assert (_cairo_surface_is_recording (surface_pattern->surface)); old_ctm = surface->ctm; old_has_ctm = surface->has_ctm; @@ -114,7 +114,7 @@ _analyze_meta_surface_pattern (cairo_analysis_surface_t *surface, cairo_matrix_multiply (&surface->ctm, &p2d, &surface->ctm); surface->has_ctm = ! _cairo_matrix_is_identity (&surface->ctm); - status = _cairo_meta_surface_replay_and_create_regions (surface_pattern->surface, + status = _cairo_recording_surface_replay_and_create_regions (surface_pattern->surface, &surface->base); surface->ctm = old_ctm; @@ -227,7 +227,7 @@ _add_operation (cairo_analysis_surface_t *surface, status = cairo_region_union_rectangle (&surface->fallback_region, rect); /* The status CAIRO_INT_STATUS_IMAGE_FALLBACK is used to indicate - * unsupported operations to the meta surface as using + * unsupported operations to the recording surface as using * CAIRO_INT_STATUS_UNSUPPORTED would cause cairo-surface to * invoke the cairo-surface-fallback path then return * CAIRO_STATUS_SUCCESS. @@ -315,8 +315,8 @@ _cairo_analysis_surface_paint (void *abstract_surface, return backend_status; } - if (backend_status == CAIRO_INT_STATUS_ANALYZE_META_SURFACE_PATTERN) - backend_status = _analyze_meta_surface_pattern (surface, source); + if (backend_status == CAIRO_INT_STATUS_ANALYZE_RECORDING_SURFACE_PATTERN) + backend_status = _analyze_recording_surface_pattern (surface, source); _cairo_analysis_surface_operation_extents (surface, op, source, clip, @@ -347,15 +347,15 @@ _cairo_analysis_surface_mask (void *abstract_surface, return backend_status; } - if (backend_status == CAIRO_INT_STATUS_ANALYZE_META_SURFACE_PATTERN) { + if (backend_status == CAIRO_INT_STATUS_ANALYZE_RECORDING_SURFACE_PATTERN) { cairo_int_status_t backend_source_status = CAIRO_STATUS_SUCCESS; cairo_int_status_t backend_mask_status = CAIRO_STATUS_SUCCESS; if (source->type == CAIRO_PATTERN_TYPE_SURFACE) { const cairo_surface_pattern_t *surface_pattern = (const cairo_surface_pattern_t *) source; - if (_cairo_surface_is_meta (surface_pattern->surface)) { + if (_cairo_surface_is_recording (surface_pattern->surface)) { backend_source_status = - _analyze_meta_surface_pattern (surface, source); + _analyze_recording_surface_pattern (surface, source); if (_cairo_status_is_error (backend_source_status)) return backend_source_status; } @@ -363,9 +363,9 @@ _cairo_analysis_surface_mask (void *abstract_surface, if (mask->type == CAIRO_PATTERN_TYPE_SURFACE) { cairo_surface_pattern_t *surface_pattern = (cairo_surface_pattern_t *) mask; - if (_cairo_surface_is_meta (surface_pattern->surface)) { + if (_cairo_surface_is_recording (surface_pattern->surface)) { backend_mask_status = - _analyze_meta_surface_pattern (surface, mask); + _analyze_recording_surface_pattern (surface, mask); if (_cairo_status_is_error (backend_mask_status)) return backend_mask_status; } @@ -421,8 +421,8 @@ _cairo_analysis_surface_stroke (void *abstract_surface, return backend_status; } - if (backend_status == CAIRO_INT_STATUS_ANALYZE_META_SURFACE_PATTERN) - backend_status = _analyze_meta_surface_pattern (surface, source); + if (backend_status == CAIRO_INT_STATUS_ANALYZE_RECORDING_SURFACE_PATTERN) + backend_status = _analyze_recording_surface_pattern (surface, source); _cairo_analysis_surface_operation_extents (surface, op, source, clip, @@ -485,8 +485,8 @@ _cairo_analysis_surface_fill (void *abstract_surface, return backend_status; } - if (backend_status == CAIRO_INT_STATUS_ANALYZE_META_SURFACE_PATTERN) - backend_status = _analyze_meta_surface_pattern (surface, source); + if (backend_status == CAIRO_INT_STATUS_ANALYZE_RECORDING_SURFACE_PATTERN) + backend_status = _analyze_recording_surface_pattern (surface, source); _cairo_analysis_surface_operation_extents (surface, op, source, clip, @@ -557,8 +557,8 @@ _cairo_analysis_surface_show_glyphs (void *abstract_surface, backend_status = CAIRO_INT_STATUS_UNSUPPORTED; } - if (backend_status == CAIRO_INT_STATUS_ANALYZE_META_SURFACE_PATTERN) - backend_status = _analyze_meta_surface_pattern (surface, source); + if (backend_status == CAIRO_INT_STATUS_ANALYZE_RECORDING_SURFACE_PATTERN) + backend_status = _analyze_recording_surface_pattern (surface, source); _cairo_analysis_surface_operation_extents (surface, op, source, clip, @@ -641,8 +641,8 @@ _cairo_analysis_surface_show_text_glyphs (void *abstract_surface, backend_status = CAIRO_STATUS_SUCCESS; } - if (backend_status == CAIRO_INT_STATUS_ANALYZE_META_SURFACE_PATTERN) - backend_status = _analyze_meta_surface_pattern (surface, source); + if (backend_status == CAIRO_INT_STATUS_ANALYZE_RECORDING_SURFACE_PATTERN) + backend_status = _analyze_recording_surface_pattern (surface, source); _cairo_analysis_surface_operation_extents (surface, op, source, clip, |