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

chrome/browser/themes/browser_theme_pack.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/themes/browser_theme_pack.h"
 
 #include <limits>
 
 #include "base/memory/ref_counted_memory.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 991 matching lines @@
       for (size_t j = 0; j < image_reps_to_tint.size(); ++j) {
         gfx::ImageSkiaRep image_rep_to_tint =  image_reps_to_tint[j];
         SkBitmap bg_tint = SkBitmapOperations::CreateHSLShiftedBitmap(
             image_rep_to_tint.sk_bitmap(), GetTintInternal(
                 ThemeService::TINT_BACKGROUND_TAB));
         gfx::Size bg_tint_dip_size(image_rep_to_tint.GetWidth(),
                                    image_rep_to_tint.GetHeight());
         int vertical_offset = bitmaps->count(prs_id)
                               ? kRestoredTabVerticalOffset : 0;
         gfx::Canvas canvas(gfx::Size(bg_tint.width(), bg_tint.height()),
-                           image_rep_to_tint.scale_factor(),
                            false);
+        SkScalar image_rep_to_tint_scale =
+            SkFloatToScalar(image_rep_to_tint.GetScale());
+        canvas.sk_canvas()->scale(image_rep_to_tint_scale,
+                                  image_rep_to_tint_scale);
         canvas.TileImageInt(bg_tint, 0, vertical_offset, 0, 0,
             bg_tint_dip_size.width(), bg_tint_dip_size.height());
 
         // If they've provided a custom image, overlay it.
         ImageCache::const_iterator overlay_it = bitmaps->find(prs_id);
         if (overlay_it != bitmaps->end()) {
           const gfx::ImageSkia* overlay = overlay_it->second->ToImageSkia();
           canvas.TileImageInt(*overlay, 0, 0, bg_tint_dip_size.width(),
                               overlay->height());
         }
-        tinted_image.AddRepresentation(canvas.ExtractImageRep());
+        SkBitmap bg_tab = canvas.ExtractBitmap();
+        tinted_image.AddRepresentation(gfx::ImageSkiaRep(bg_tab,
+            image_rep_to_tint.scale_factor()));
       }
 
       temp_output[prs_id] = new gfx::Image(tinted_image);
     }
   }
 
   MergeImageCaches(temp_output, bitmaps);
 }
 
 void BrowserThemePack::RepackImages(const ImageCache& images,
@@ skipping 43 matching lines @@
         hsl.h = tints_[i].h;
         hsl.s = tints_[i].s;
         hsl.l = tints_[i].l;
         return hsl;
       }
     }
   }
 
   return ThemeService::GetDefaultTint(id);
 }