views: Delete painter pointer using scoped_ptr.

ui/views/border.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/border.h"
 
 #include "base/logging.h"
+#include "base/memory/scoped_ptr.h"
 #include "ui/gfx/canvas.h"
 #include "ui/views/painter.h"
 
 namespace views {
 
 namespace {
 
 // A simple border with different thicknesses on each side and single color.
 class SidedSolidBorder : public Border {
  public:
   SidedSolidBorder(int top, int left, int bottom, int right, SkColor color);
 
   // Overridden from Border:
   virtual void Paint(const View& view, gfx::Canvas* canvas) const OVERRIDE;
   virtual void GetInsets(gfx::Insets* insets) const OVERRIDE;
 
  private:
-  int top_, left_, bottom_, right_;
+  int top_;

[sky, 2012/09/17 14:10:27]

const

+  int left_;
+  int bottom_;
+  int right_;
   SkColor color_;
   gfx::Insets insets_;
 
   DISALLOW_COPY_AND_ASSIGN(SidedSolidBorder);
 };
 
 SidedSolidBorder::SidedSolidBorder(int top, int left, int bottom, int right,

[sky, 2012/09/17 14:10:27]

each param on its own line.

-    SkColor color)
+                                   SkColor color)
     : top_(top),
       left_(left),
       bottom_(bottom),
       right_(right),
       color_(color),
       insets_(top, left, bottom, right) {
 }
 
 void SidedSolidBorder::Paint(const View& view, gfx::Canvas* canvas) const {
   // Top border.
@@ skipping 46 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(EmptyBorder);
 };
 
 class BorderPainter : public Border {
  public:
   explicit BorderPainter(Painter* painter)
       : painter_(painter) {
     DCHECK(painter);
   }
 
-  virtual ~BorderPainter() {
-    delete painter_;
-    painter_ = NULL;
-  }
+  virtual ~BorderPainter() {}
 
   // Overridden from Border:
   virtual void Paint(const View& view, gfx::Canvas* canvas) const OVERRIDE {
-    Painter::PaintPainterAt(canvas, painter_, view.GetLocalBounds());
+    Painter::PaintPainterAt(canvas, painter_.get(), view.GetLocalBounds());
   }
 
   virtual void GetInsets(gfx::Insets* insets) const OVERRIDE {
     DCHECK(insets);
     insets->Set(0, 0, 0, 0);
   }
 
  private:
-  Painter* painter_;
+  scoped_ptr<Painter> painter_;
 
   DISALLOW_COPY_AND_ASSIGN(BorderPainter);
 };
 
-} // namespace
+}  // namespace
 
 Border::Border() {
 }
 
 Border::~Border() {
 }
 
 // static
 Border* Border::CreateSolidBorder(int thickness, SkColor color) {
   return new SolidBorder(thickness, color);
 }
 
 // static
 Border* Border::CreateEmptyBorder(int top, int left, int bottom, int right) {
   return new EmptyBorder(top, left, bottom, right);
 }
 
 // static
 Border* Border::CreateSolidSidedBorder(int top, int left,

[sky, 2012/09/17 14:10:27]

each param on its own line.

-    int bottom, int right,
-    SkColor color) {
+                                       int bottom, int right,
+                                       SkColor color) {
   return new SidedSolidBorder(top, left, bottom, right, color);
 }
 
-//static
+// static
 Border* Border::CreateBorderPainter(Painter* painter) {
   return new BorderPainter(painter);
 }
 
 }  // namespace views