Change Painter factory functions to unique_ptr

ui/views/painter.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/views/painter.h"
 
 #include <memory>
 
 #include "base/logging.h"
 #include "base/macros.h"
@@ skipping 279 matching lines @@
 
 // static
 void Painter::PaintFocusPainter(View* view,
                                 gfx::Canvas* canvas,
                                 Painter* focus_painter) {
   if (focus_painter && view->HasFocus())
     PaintPainterAt(canvas, focus_painter, view->GetLocalBounds());
 }
 
 // static
-Painter* Painter::CreateSolidRoundRectPainter(SkColor color, float radius) {
-  return new SolidRoundRectPainter(color, SK_ColorTRANSPARENT, radius);
+std::unique_ptr<Painter> Painter::CreateSolidRoundRectPainter(SkColor color,
+                                                              float radius) {
+  return base::MakeUnique<SolidRoundRectPainter>(color, SK_ColorTRANSPARENT,
+                                                 radius);
 }
 
 // static
-Painter* Painter::CreateRoundRectWith1PxBorderPainter(SkColor bg_color,
-                                                      SkColor stroke_color,
-                                                      float radius) {
-  return new SolidRoundRectPainter(bg_color, stroke_color, radius);
+std::unique_ptr<Painter> Painter::CreateRoundRectWith1PxBorderPainter(
+    SkColor bg_color,
+    SkColor stroke_color,
+    float radius) {
+  return base::MakeUnique<SolidRoundRectPainter>(bg_color, stroke_color,
+                                                 radius);
 }
 
 // static
-Painter* Painter::CreateHorizontalGradient(SkColor c1, SkColor c2) {
+std::unique_ptr<Painter> Painter::CreateVerticalGradient(SkColor c1,
+                                                         SkColor c2) {
   SkColor colors[2];
   colors[0] = c1;
   colors[1] = c2;
   SkScalar pos[] = {0, 1};
-  return new GradientPainter(true, colors, pos, 2);
+  return base::MakeUnique<GradientPainter>(false, colors, pos, 2);
 }
 
 // static
-Painter* Painter::CreateVerticalGradient(SkColor c1, SkColor c2) {
-  SkColor colors[2];
-  colors[0] = c1;
-  colors[1] = c2;
-  SkScalar pos[] = {0, 1};
-  return new GradientPainter(false, colors, pos, 2);
+std::unique_ptr<Painter> Painter::CreateImagePainter(
+    const gfx::ImageSkia& image,
+    const gfx::Insets& insets) {
+  return base::MakeUnique<ImagePainter>(image, insets);
 }
 
 // static
-Painter* Painter::CreateVerticalMultiColorGradient(SkColor* colors,
-                                                   SkScalar* pos,
-                                                   size_t count) {
-  return new GradientPainter(false, colors, pos, count);
+std::unique_ptr<Painter> Painter::CreateImageGridPainter(
+    const int image_ids[]) {
+  return base::MakeUnique<ImagePainter>(image_ids);
 }
 
 // static
-Painter* Painter::CreateImagePainter(const gfx::ImageSkia& image,
-                                     const gfx::Insets& insets) {
-  return new ImagePainter(image, insets);
-}
-
-// static
-Painter* Painter::CreateImageGridPainter(const int image_ids[]) {
-  return new ImagePainter(image_ids);
-}
-
-// static
 std::unique_ptr<Painter> Painter::CreateDashedFocusPainter() {
   return base::MakeUnique<DashedFocusPainter>(gfx::Insets());
 }
 
 // static
 std::unique_ptr<Painter> Painter::CreateDashedFocusPainterWithInsets(
     const gfx::Insets& insets) {
   return base::MakeUnique<DashedFocusPainter>(insets);
 }
 
@@ skipping 45 matching lines @@
   canvas->DrawImageInt(*images_[LEFT], 0, 0);
   canvas->DrawImageInt(*images_[RIGHT], size.width() - images_[RIGHT]->width(),
                        0);
   canvas->TileImageInt(
       *images_[CENTER], images_[LEFT]->width(), 0,
       size.width() - images_[LEFT]->width() - images_[RIGHT]->width(),
       images_[LEFT]->height());
 }
 
 }  // namespace views