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

ui/base/native_theme/native_theme_android.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/base/native_theme/native_theme_android.h"
 
 #include <limits>
 
 #include "base/basictypes.h"
 #include "base/logging.h"
-#include "base/memory/scoped_ptr.h"
 #include "grit/ui_resources.h"
 #include "third_party/skia/include/effects/SkGradientShader.h"
 #include "ui/base/layout.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/color_utils.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/size.h"
 
 namespace ui {
@@ skipping 642 matching lines @@
                                        int src_h,
                                        int dest_x,
                                        int dest_y,
                                        int dest_w,
                                        int dest_h) const {
   // TODO(pkotwicz): Do something better and don't infer device
   // scale factor from canvas scale.
   SkMatrix m = sk_canvas->getTotalMatrix();
   ui::ScaleFactor device_scale_factor = ui::GetScaleFactorFromScale(
       SkScalarAbs(m.getScaleX()));
-  scoped_ptr<gfx::Canvas> canvas(gfx::Canvas::CreateCanvasWithoutScaling(
-      sk_canvas, device_scale_factor));
-  canvas->DrawImageInt(image, src_x, src_y, src_w, src_h,
+  gfx::Canvas canvas(sk_canvas, device_scale_factor, false);
+  canvas.DrawImageInt(image, src_x, src_y, src_w, src_h,
       dest_x, dest_y, dest_w, dest_h, true);
 }
 
 void NativeThemeAndroid::DrawTiledImage(SkCanvas* sk_canvas,
                                         const gfx::ImageSkia& image,
                                         int src_x,
                                         int src_y,
                                         float tile_scale_x,
                                         float tile_scale_y,
                                         int dest_x,
                                         int dest_y,
                                         int w,
                                         int h) const {
   // TODO(pkotwicz): Do something better and don't infer device
   // scale factor from canvas scale.
   SkMatrix m = sk_canvas->getTotalMatrix();
   ui::ScaleFactor device_scale_factor = ui::GetScaleFactorFromScale(
       SkScalarAbs(m.getScaleX()));
-  scoped_ptr<gfx::Canvas> canvas(gfx::Canvas::CreateCanvasWithoutScaling(
-      sk_canvas, device_scale_factor));
-  canvas->TileImageInt(image, src_x, src_y, tile_scale_x,
+  gfx::Canvas canvas(sk_canvas, device_scale_factor, false);
+  canvas.TileImageInt(image, src_x, src_y, tile_scale_x,
       tile_scale_y, dest_x, dest_y, w, h);
 }
 
 SkColor NativeThemeAndroid::SaturateAndBrighten(
     SkScalar* hsv,
     SkScalar saturate_amount,
     SkScalar brighten_amount) const {
   SkScalar color[3];
   color[0] = hsv[0];
   color[1] = Clamp(hsv[1] + saturate_amount, 0.0, 1.0);
@@ skipping 42 matching lines @@
   SkScalar min_diff = Clamp((hsv1[1] + hsv2[1]) * 1.2, 0.28, 0.5);
   SkScalar diff = Clamp(fabs(hsv1[2] - hsv2[2]) / 2, min_diff, 0.5);
 
   if (hsv1[2] + hsv2[2] > 1.0)
     diff = -diff;
 
   return SaturateAndBrighten(hsv2, -0.2, diff);
 }
 
 }  // namespace ui