forked from mirrors/gecko-dev
47eafd52d1
Rotated text was sometimes broken because there was a mismatch of assumptions between cairo and Gecko about how important it was for the ctm of a scaled_font to match the ctm of a context. This temporarily fixes the problem by disabling the previous_scaled_font cache with bug #583035 tracking a more permanent fix.
16 lines
634 B
Diff
16 lines
634 B
Diff
diff --git a/gfx/cairo/cairo/src/cairo.c b/gfx/cairo/cairo/src/cairo.c
|
|
--- a/gfx/cairo/cairo/src/cairo.c
|
|
+++ b/gfx/cairo/cairo/src/cairo.c
|
|
@@ -3201,8 +3201,12 @@ cairo_set_scaled_font (cairo_t
|
|
|
|
_cairo_gstate_set_font_options (cr->gstate, &scaled_font->options);
|
|
|
|
+ /* XXX: Mozilla code assumes that the ctm of a scaled font doesn't need to
|
|
+ * match the context ctm. This assumption breaks the previous_scaled_font
|
|
+ * cache. So we avoid using the cache for now.
|
|
if (was_previous)
|
|
cr->gstate->scaled_font = cairo_scaled_font_reference ((cairo_scaled_font_t *) scaled_font);
|
|
+ */
|
|
|
|
return;
|
|
|