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

chrome/browser/ui/libgtk2ui/gtk2_ui.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 "chrome/browser/ui/libgtk2ui/gtk2_ui.h"
 
 #include <set>
 
 #include "base/command_line.h"
 #include "base/i18n/rtl.h"
@@ skipping 722 matching lines @@
 SkBitmap Gtk2UI::GenerateFrameImage(
     int color_id,
     const char* gradient_name) const {
   // We use two colors: the main color (passed in) and a lightened version of
   // that color (which is supposed to match the light gradient at the top of
   // several GTK+ themes, such as Ambiance, Clearlooks or Bluebird).
   ColorMap::const_iterator it = colors_.find(color_id);
   DCHECK(it != colors_.end());
   SkColor base = it->second;
 
-  gfx::Canvas canvas(gfx::Size(kToolbarImageWidth, kToolbarImageHeight),
-      ui::SCALE_FACTOR_100P, true);
+  gfx::Canvas canvas(gfx::Size(kToolbarImageWidth, kToolbarImageHeight), true);
 
   int gradient_size;
   GdkColor* gradient_top_color = NULL;
   gtk_widget_style_get(GTK_WIDGET(fake_frame_),
                        "frame-gradient-size", &gradient_size,
                        gradient_name, &gradient_top_color,
                        NULL);
   if (gradient_size) {
     SkColor lighter = gradient_top_color ?
         GdkColorToSkColor(*gradient_top_color) :
         color_utils::HSLShift(base, kGtkFrameShift);
     if (gradient_top_color)
       gdk_color_free(gradient_top_color);
     SkShader* shader = gfx::CreateGradientShader(
         0, gradient_size, lighter, base);
     SkPaint paint;
     paint.setStyle(SkPaint::kFill_Style);
     paint.setAntiAlias(true);
     paint.setShader(shader);
     shader->unref();
 
     canvas.DrawRect(gfx::Rect(0, 0, kToolbarImageWidth, gradient_size), paint);
   }
 
   canvas.FillRect(gfx::Rect(0, gradient_size, kToolbarImageWidth,
                             kToolbarImageHeight - gradient_size), base);
-  return canvas.ExtractImageRep().sk_bitmap();
+  return canvas.ExtractBitmap();
 }
 
 SkBitmap Gtk2UI::GenerateTabImage(int base_id) const {
   const SkBitmap* base_image = GetThemeImageNamed(base_id)->ToSkBitmap();
   SkBitmap bg_tint = SkBitmapOperations::CreateHSLShiftedBitmap(
       *base_image, GetDefaultTint(ThemeService::TINT_BACKGROUND_TAB));
   return SkBitmapOperations::CreateTiledBitmap(
       bg_tint, 0, 0, bg_tint.width(), bg_tint.height());
 }
 
@@ skipping 169 matching lines @@
 
 void Gtk2UI::ClearAllThemeData() {
   STLDeleteValues(&gtk_images_);
 }
 
 }  // namespace libgtk2ui
 
 ui::LinuxUI* BuildGtk2UI() {
   return new libgtk2ui::Gtk2UI;
 }