Reverting 20516.

app/gfx/canvas_linux.cc

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "app/gfx/canvas.h"
 
 #include <cairo/cairo.h>
 #include <pango/pango.h>
 #include <pango/pangocairo.h>
 
@@ skipping 77 matching lines @@
 
   pango_layout_get_size(layout, width, height);
   *width /= PANGO_SCALE;
   *height /= PANGO_SCALE;
   g_object_unref(layout);
   pango_font_description_free(desc);
   cairo_destroy(cr);
   cairo_surface_destroy(surface);
 }
 
-void Canvas::ApplySkiaMatrixToCairoContext(cairo_t* cr) {
-  const SkMatrix& skia_matrix = getTotalMatrix();
-  cairo_matrix_t cairo_matrix;
-  cairo_matrix_init(&cairo_matrix,
-                    SkScalarToFloat(skia_matrix.getScaleX()),
-                    SkScalarToFloat(skia_matrix.getSkewY()),
-                    SkScalarToFloat(skia_matrix.getSkewX()),
-                    SkScalarToFloat(skia_matrix.getScaleY()),
-                    SkScalarToFloat(skia_matrix.getTranslateX()),
-                    SkScalarToFloat(skia_matrix.getTranslateY()));
-  cairo_set_matrix(cr, &cairo_matrix);
-}
-
 void Canvas::DrawStringInt(const std::wstring& text,
                            const gfx::Font& font,
                            const SkColor& color, int x, int y, int w, int h,
                            int flags) {
-  cairo_surface_t* surface = beginPlatformPaint();
-  cairo_t* cr = cairo_create(surface);
-  // We're going to draw onto the surface directly. This circumvents the matrix
-  // installed by Skia. Apply the matrix from skia to cairo so they align and
-  // we draw at the right place.
-  ApplySkiaMatrixToCairoContext(cr);
+  cairo_t* cr = beginPlatformPaint();
   PangoLayout* layout = pango_cairo_create_layout(cr);
 
   cairo_set_source_rgb(cr,
                        SkColorGetR(color) / 255.0,
                        SkColorGetG(color) / 255.0,
                        SkColorGetB(color) / 255.0);
 
   // TODO(deanm): Implement the rest of the Canvas flags.
   if (!(flags & Canvas::NO_ELLIPSIS))
     pango_layout_set_ellipsize(layout, PANGO_ELLIPSIZE_END);
@@ skipping 31 matching lines @@
     y = y + (h - (height / PANGO_SCALE));
   } else {
     // Vertically centered.
     y = y + ((h - (height / PANGO_SCALE)) / 2);
   }
 
   cairo_move_to(cr, x, y);
   pango_cairo_show_layout(cr, layout);
 
   g_object_unref(layout);
-  cairo_destroy(cr);
   // NOTE: beginPlatformPaint returned its surface, we shouldn't destroy it.
 }
 
 }  // namespace gfx