Revert 147915 - Cleanup gfx::Canvas now that 10562027 has landed

ui/gfx/canvas_linux.cc

 // Copyright (c) 2012 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 "ui/gfx/canvas.h"
 
 #include <algorithm>
 
 #include <cairo/cairo.h>
 #include <pango/pango.h>
@@ skipping 94 matching lines @@
 }
 
 void DrawStringContext::Draw(SkColor text_color) {
   DrawPangoLayout(cr_, layout_, font_, bounds_, text_rect_, text_color,
                   text_direction_, flags_);
 }
 
 void DrawStringContext::DrawWithHalo(SkColor text_color,
                                      SkColor halo_color) {
   gfx::Size size(bounds_.width() + 2, bounds_.height() + 2);
-  gfx::Canvas text_canvas(size, scale_factor(), false);
+  gfx::Canvas text_canvas(size, false);
   text_canvas.FillRect(gfx::Rect(size), static_cast<SkColor>(0));
 
   {
     skia::ScopedPlatformPaint scoped_platform_paint(text_canvas.sk_canvas());
     cairo_t* text_cr = scoped_platform_paint.GetPlatformSurface();
 
     // TODO: The current approach (stroking the text path to generate the halo
     // and then filling it for the main text) won't work if |text_color| is
     // non-opaque.  If we need to do this at some later point,
     // http://lists.freedesktop.org/archives/cairo/2004-September/001829.html
@@ skipping 24 matching lines @@
                           SkColorGetB(text_color) / 255.0,
                           SkColorGetA(text_color) / 255.0);
     cairo_fill(text_cr);
 
     if (font_.GetStyle() & gfx::Font::UNDERLINED)
       DrawUnderline(text_cr, 0.0);
   }
 
   const SkBitmap& text_bitmap = const_cast<SkBitmap&>(
       skia::GetTopDevice(*text_canvas.sk_canvas())->accessBitmap(false));
-  const gfx::ImageSkia text_image = gfx::ImageSkia(gfx::ImageSkiaRep(
-      text_bitmap, text_canvas.scale_factor()));
-  canvas_->DrawImageInt(text_image, text_rect_.x() - 1, text_rect_.y() - 1);
+  canvas_->DrawImageInt(text_bitmap, text_rect_.x() - 1, text_rect_.y() - 1);
 }
 
 void DrawStringContext::DrawUnderline(cairo_t* cr, double extra_edge_width) {
   gfx::PlatformFontPango* platform_font =
       static_cast<gfx::PlatformFontPango*>(font_.platform_font());
   gfx::DrawPangoTextUnderline(cr,
                               platform_font,
                               extra_edge_width,
                               text_rect_);
 }
@@ skipping 82 matching lines @@
   DLOG_IF(WARNING, !shadows.empty()) << "Text shadow not implemented.";
 
   if (!IntersectsClipRect(text_bounds))
     return;
 
   DrawStringContext context(this, text, font, text_bounds, text_bounds, flags);
   context.Draw(color);
 }
 
 }  // namespace gfx