michael@0: --- a/gfx/cairo/cairo/src/cairo-quartz-font.c	Wed Dec 23 14:17:44 2009 -0500
michael@0: +++ b/gfx/cairo/cairo/src/cairo-quartz-font.c	Wed Dec 23 20:45:00 2009 +0000
michael@0: @@ -420,6 +420,16 @@ _cairo_quartz_init_glyph_metrics (cairo_
michael@0:  	!CGFontGetGlyphBBoxesPtr (font_face->cgFont, &glyph, 1, &bbox))
michael@0:  	goto FAIL;
michael@0:  
michael@0: +    /* broken fonts like Al Bayan return incorrect bounds for some null characters,
michael@0: +       see https://bugzilla.mozilla.org/show_bug.cgi?id=534260 */
michael@0: +    if (unlikely (bbox.origin.x == -32767 &&
michael@0: +                  bbox.origin.y == -32767 &&
michael@0: +                  bbox.size.width == 65534 &&
michael@0: +                  bbox.size.height == 65534)) {
michael@0: +        bbox.origin.x = bbox.origin.y = 0;
michael@0: +        bbox.size.width = bbox.size.height = 0;
michael@0: +    }
michael@0: +
michael@0:      status = _cairo_matrix_compute_basis_scale_factors (&font->base.scale,
michael@0:  						  &xscale, &yscale, 1);
michael@0:      if (status)