Bug 922515 - Don't apply a skew matrix to the DT when it's cairo, since we use the cairo font with it already applied. r=Bas

--HG--
extra : rebase_source : 289ed3a9e02bd5499b49aa1181dd35bf16eba5d3

gfx/thebes/gfxFont.cpp

@@ -2647,7 +2647,10 @@ gfxFont::Draw(gfxTextRun *aTextRun, uint32_t aStart, uint32_t aEnd,
       DrawOptions drawOptions;
       drawOptions.mAntialiasMode = Get2DAAMode(mAntialiasOption);
 
-      if (mScaledFont) {
+      // The cairo DrawTarget backend uses the cairo_scaled_font directly
+      // and so has the font skew matrix applied already.
+      if (mScaledFont &&
+          dt->GetType() != BACKEND_CAIRO) {
         cairo_matrix_t matrix;
         cairo_scaled_font_get_font_matrix(mScaledFont, &matrix);
         if (matrix.xy != 0) {