Remove clip handling from generic surface layer.

Handling clip as part of the surface state, as opposed to being part of
the operation state, is cumbersome and a hindrance to providing true proxy
surface support. For example, the clip must be copied from the surface
onto the fallback image, but this was forgotten causing undue hassle in
each backend. Another example is the contortion the meta surface
endures to ensure the clip is correctly recorded. By contrast passing the
clip along with the operation is quite simple and enables us to write
generic handlers for providing surface wrappers. (And in the future, we
should be able to write more esoteric wrappers, e.g. automatic 2x FSAA,
trivially.)

In brief, instead of the surface automatically applying the clip before
calling the backend, the backend can call into a generic helper to apply
clipping. For raster surfaces, clip regions are handled automatically as
part of the composite interface. For vector surfaces, a clip helper is
introduced to replay and callback into an intersect_clip_path() function
as necessary.

Whilst this is not primarily a performance related change (the change
should just move the computation of the clip from the moment it is applied
by the user to the moment it is required by the backend), it is important
to track any potential regression:

ppc:
Speedups
========
image-rgba         evolution-20090607-0    1026085.22 0.18% -> 672972.07 0.77%:  1.52x speedup
▌
image-rgba         evolution-20090618-0    680579.98 0.12% -> 573237.66  0.16%:  1.19x speedup
▎
image-rgba      swfdec-fill-rate-4xaa-0    460296.92 0.36% -> 407464.63  0.42%:  1.13x speedup
▏
image-rgba      swfdec-fill-rate-2xaa-0    128431.95 0.47% -> 115051.86  0.42%:  1.12x speedup
▏
Slowdowns
=========
image-rgba     firefox-periodic-table-0    56837.61 0.78% -> 66055.17    3.20%:  1.09x slowdown
▏

1 files changed, 9 insertions, 21 deletions

diff --git a/src/cairo-user-font.c b/src/cairo-user-font.c
index 1adfd7d6..42e8bae2 100644
--- a/src/cairo-user-font.c
+++ b/src/cairo-user-font.c
@@ -85,7 +85,7 @@ _cairo_user_scaled_font_create_meta_context (cairo_user_scaled_font_t *scaled_fo
 						     CAIRO_CONTENT_COLOR_ALPHA :
 						     CAIRO_CONTENT_ALPHA;
 
-    meta_surface = cairo_meta_surface_create (content, -1, -1);
+    meta_surface = cairo_meta_surface_create (content, NULL);
     cr = cairo_create (meta_surface);
     cairo_surface_destroy (meta_surface);
 
@@ -114,11 +114,11 @@ _cairo_user_scaled_glyph_init (void			 *abstract_font,
 
 	cr = _cairo_user_scaled_font_create_meta_context (scaled_font);
 
-	if (face->scaled_font_methods.render_glyph)
+	if (face->scaled_font_methods.render_glyph) {
 	    status = face->scaled_font_methods.render_glyph ((cairo_scaled_font_t *)scaled_font,
 							     _cairo_scaled_glyph_index(scaled_glyph),
 							     cr, &extents);
-	else
+	} else
 	    status = CAIRO_STATUS_USER_FONT_NOT_IMPLEMENTED;
 
 	if (status == CAIRO_STATUS_SUCCESS)
@@ -141,27 +141,16 @@ _cairo_user_scaled_glyph_init (void			 *abstract_font,
 	/* set metrics */
 
 	if (extents.width == 0.) {
-	    /* Compute extents.x/y/width/height from meta_surface, in font space */
-
 	    cairo_box_t bbox;
 	    double x1, y1, x2, y2;
 	    double x_scale, y_scale;
-	    cairo_surface_t *null_surface;
-	    cairo_surface_t *analysis_surface;
-
-	    null_surface = _cairo_null_surface_create (cairo_surface_get_content (meta_surface));
-	    analysis_surface = _cairo_analysis_surface_create (null_surface, -1, -1);
-	    cairo_surface_destroy (null_surface);
-	    status = analysis_surface->status;
-	    if (unlikely (status))
-		return status;
-
-	    _cairo_analysis_surface_set_ctm (analysis_surface,
-					     &scaled_font->extent_scale);
-	    status = cairo_meta_surface_replay (meta_surface, analysis_surface);
-	    _cairo_analysis_surface_get_bounding_box (analysis_surface, &bbox);
-	    cairo_surface_destroy (analysis_surface);
 
+	    /* Compute extents.x/y/width/height from meta_surface,
+	     * in font space.
+	     */
+	    status = _cairo_meta_surface_get_bbox ((cairo_meta_surface_t *) meta_surface,
+						   &bbox,
+						   &scaled_font->extent_scale);
 	    if (unlikely (status))
 		return status;
 
@@ -231,7 +220,6 @@ _cairo_user_scaled_glyph_init (void			 *abstract_font,
 	    return _cairo_error (CAIRO_STATUS_NO_MEMORY);
 
 	status = _cairo_meta_surface_get_path (meta_surface, path);
-
 	if (unlikely (status)) {
 	    _cairo_path_fixed_destroy (path);
 	    return status;