Bug 1336350: CAIRO_INT_STATUS_UNSUPPORTED is a special case of an error. r=jrmuizel
authorMilan Sreckovic <milan@mozilla.com>
Fri, 24 Feb 2017 18:02:19 -0500
changeset 374207 ce4d5be6f3fb01e6f896d7be1ee5a027289b28a4
parent 374206 17b6cdda4c106fba27557407fe598b08d5ffbf65
child 374208 d34e52a93da46aaf20887bafd7c72ebd36bad2b9
push id10863
push userjlorenzo@mozilla.com
push dateMon, 06 Mar 2017 23:02:23 +0000
treeherdermozilla-aurora@0931190cd725 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjrmuizel
bugs1336350
milestone54.0a1
Bug 1336350: CAIRO_INT_STATUS_UNSUPPORTED is a special case of an error. r=jrmuizel MozReview-Commit-ID: Hsl5eA1YMl0
gfx/cairo/cairo/src/cairo-scaled-font.c
--- a/gfx/cairo/cairo/src/cairo-scaled-font.c
+++ b/gfx/cairo/cairo/src/cairo-scaled-font.c
@@ -1504,17 +1504,19 @@ cairo_scaled_font_glyph_extents (cairo_s
     for (i = 0; i < num_glyphs; i++) {
 	double			left, top, right, bottom;
 
 	status = _cairo_scaled_glyph_lookup (scaled_font,
 					     glyphs[i].index,
 					     CAIRO_SCALED_GLYPH_INFO_METRICS,
 					     &scaled_glyph);
 	if (unlikely (status)) {
-	    status = _cairo_scaled_font_set_error (scaled_font, status);
+	    if (status != CAIRO_INT_STATUS_UNSUPPORTED) {
+		status = _cairo_scaled_font_set_error (scaled_font, status);
+	    }
 	    goto UNLOCK;
 	}
 
 	/* "Ink" extents should skip "invisible" glyphs */
 	if (scaled_glyph->metrics.width == 0 || scaled_glyph->metrics.height == 0)
 	    continue;
 
 	left = scaled_glyph->metrics.x_bearing + glyphs[i].x;