Attachment 8234 Details for Bug 9467 – patch 2/3. Switches glyph rendering to fallback for non-quartz surfaces.

[patch] patch 2/3. Switches glyph rendering to fallback for non-quartz surfaces.

glyph-surface-patch-2.txt (text/plain), 4.21 KB, created by Brian Ewins on 2006-12-28 06:04:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Brian Ewins

Created: 2006-12-28 06:04:48 UTC

Size: 4.21 KB

patch

obsolete

>[ATSUI] enable the glyph mask surface fallback for non-quartz surfaces.
>This patch makes all tests for non-quartz surfaces fail when ATSUI is
>enabled.
>
>---
>commit 84643733917a2e5a3c9421142ae174758f7e62be
>tree 62340ca239b120bc7aa245bfe9173e9cc1223ed4
>parent dbf49b80dbfe2915bcdad1ef6600af5d720d913e
>author Brian Ewins <Brian.Ewins@gmail.com> Thu, 28 Dec 2006 13:14:37 +0000
>committer Brian Ewins <Brian.Ewins@gmail.com> Thu, 28 Dec 2006 13:14:37 +0000
>
> src/cairo-atsui-font.c |   77 +++++++++++++++++++++++++++---------------------
> 1 files changed, 44 insertions(+), 33 deletions(-)
>
>diff --git a/src/cairo-atsui-font.c b/src/cairo-atsui-font.c
>index 1e601a1..b85c935 100644
>--- a/src/cairo-atsui-font.c
>+++ b/src/cairo-atsui-font.c
>@@ -604,6 +604,13 @@ _cairo_atsui_scaled_font_init_glyph_path
>     return CAIRO_STATUS_SUCCESS;
> }
> 
>+static cairo_status_t
>+_cairo_atsui_scaled_font_init_glyph_surface (cairo_atsui_font_t *scaled_font,
>+					  cairo_scaled_glyph_t *scaled_glyph)
>+{
>+    return CAIRO_INT_STATUS_UNSUPPORTED;
>+}
>+
> static cairo_int_status_t
> _cairo_atsui_font_scaled_glyph_init (void			*abstract_font,
> 				     cairo_scaled_glyph_t	*scaled_glyph,
>@@ -624,6 +631,12 @@ _cairo_atsui_font_scaled_glyph_init (voi
> 	    return status;
>     }
> 
>+    if ((info & CAIRO_SCALED_GLYPH_INFO_SURFACE) != 0) {
>+	status = _cairo_atsui_scaled_font_init_glyph_surface (scaled_font, scaled_glyph);
>+	if (status)
>+	    return status;
>+    }
>+
>     return CAIRO_STATUS_SUCCESS;
> }
> 
>@@ -707,14 +720,17 @@ _cairo_atsui_font_old_show_glyphs (void
>     void *extra = NULL;
>     cairo_bool_t can_draw_directly;
>     cairo_rectangle_int16_t rect;
>+    cairo_quartz_surface_t *surface = (cairo_quartz_surface_t *)generic_surface;
> 
>     ATSFontRef atsFont;
>     CGFontRef cgFont;
>     CGAffineTransform textTransform;
> 
>+    if (!_cairo_surface_is_quartz (generic_surface))
>+	return CAIRO_INT_STATUS_UNSUPPORTED;
>+
>     /* Check if we can draw directly to the destination surface */
>-    can_draw_directly = _cairo_surface_is_quartz (generic_surface) &&
>-	_cairo_pattern_is_opaque_solid (pattern) &&
>+    can_draw_directly = _cairo_pattern_is_opaque_solid (pattern) &&
> 	op == CAIRO_OPERATOR_OVER;
> 
>     if (!can_draw_directly) {
>@@ -767,38 +783,33 @@ _cairo_atsui_font_old_show_glyphs (void
> 	CGContextSetRGBFillColor(drawingContext, 0.0f, 0.0f, 0.0f, 0.0f);
>     }
> 
>-    if (_cairo_surface_is_quartz (generic_surface)) {
>-	cairo_quartz_surface_t *surface = (cairo_quartz_surface_t *)generic_surface;
>-	if (surface->clip_region) {
>-	    pixman_box16_t *boxes = pixman_region_rects (surface->clip_region);
>-	    int num_boxes = pixman_region_num_rects (surface->clip_region);
>-	    CGRect stack_rects[10];
>-	    CGRect *rects;
>-	    int i;
>-
>-	    /* XXX: Return-value of malloc needs to be checked for
>-	     * NULL. Can someone fix this who is more familiar with
>-	     * the cleanup needed in this function?
>-	     */
>-	    if (num_boxes > 10)
>-		rects = malloc (sizeof (CGRect) * num_boxes);
>-	    else
>-		rects = stack_rects;
>-
>-	    for (i = 0; i < num_boxes; i++) {
>-		rects[i].origin.x = boxes[i].x1;
>-		rects[i].origin.y = boxes[i].y1;
>-		rects[i].size.width = boxes[i].x2 - boxes[i].x1;
>-		rects[i].size.height = boxes[i].y2 - boxes[i].y1;
>-	    }
>-
>-	    CGContextClipToRects (drawingContext, rects, num_boxes);
>-
>-	    if (rects != stack_rects)
>-		free(rects);
>+    if (surface->clip_region) {
>+	pixman_box16_t *boxes = pixman_region_rects (surface->clip_region);
>+	int num_boxes = pixman_region_num_rects (surface->clip_region);
>+	CGRect stack_rects[10];
>+	CGRect *rects;
>+	int i;
>+	
>+	/* XXX: Return-value of malloc needs to be checked for
>+	 * NULL. Can someone fix this who is more familiar with
>+	 * the cleanup needed in this function?
>+	 */
>+	if (num_boxes > 10)
>+	    rects = malloc (sizeof (CGRect) * num_boxes);
>+	else
>+	    rects = stack_rects;
>+	
>+	for (i = 0; i < num_boxes; i++) {
>+	    rects[i].origin.x = boxes[i].x1;
>+	    rects[i].origin.y = boxes[i].y1;
>+	    rects[i].size.width = boxes[i].x2 - boxes[i].x1;
>+	    rects[i].size.height = boxes[i].y2 - boxes[i].y1;
> 	}
>-    } else {
>-	/* XXX: Need to get the text clipped */
>+	
>+	CGContextClipToRects (drawingContext, rects, num_boxes);
>+	
>+	if (rects != stack_rects)
>+	    free(rects);
>     }
> 
>     /* TODO - bold and italic text

Actions: View | Splinter Review

Attachments on bug 9467: 8233 | 8234 | 8235 | 8236 | 8237

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.