michael@0: diff --git a/gfx/cairo/cairo/src/cairo.c b/gfx/cairo/cairo/src/cairo.c michael@0: --- a/gfx/cairo/cairo/src/cairo.c michael@0: +++ b/gfx/cairo/cairo/src/cairo.c michael@0: @@ -3201,8 +3201,12 @@ cairo_set_scaled_font (cairo_t michael@0: michael@0: _cairo_gstate_set_font_options (cr->gstate, &scaled_font->options); michael@0: michael@0: + /* XXX: Mozilla code assumes that the ctm of a scaled font doesn't need to michael@0: + * match the context ctm. This assumption breaks the previous_scaled_font michael@0: + * cache. So we avoid using the cache for now. michael@0: if (was_previous) michael@0: cr->gstate->scaled_font = cairo_scaled_font_reference ((cairo_scaled_font_t *) scaled_font); michael@0: + */ michael@0: michael@0: return; michael@0: