Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1051)

Unified Diff: ui/views/painter.cc

Issue 10953002: views: Delete some array pointers in GradientPainter using scoped_array. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/painter.cc
diff --git a/ui/views/painter.cc b/ui/views/painter.cc
index 2a6d06176f032a84cb916a387fe588142c587567..4275c549a5b6db50b76afa7d6522b3b8c5d9f4f4 100644
--- a/ui/views/painter.cc
+++ b/ui/views/painter.cc
@@ -5,6 +5,7 @@
#include "ui/views/painter.h"
#include "base/logging.h"
+#include "base/memory/scoped_ptr.h"
#include "third_party/skia/include/effects/SkGradientShader.h"
#include "ui/base/resource/resource_bundle.h"
#include "ui/gfx/canvas.h"
@@ -26,8 +27,8 @@ class GradientPainter : public Painter {
size_t count)
: horizontal_(horizontal),
count_(count) {
- pos_ = new SkScalar[count_];
- colors_ = new SkColor[count_];
+ pos_.reset(new SkScalar[count_]);
+ colors_.reset(new SkColor[count_]);
for (size_t i = 0; i < count_; ++i) {
pos_[i] = pos[i];
@@ -35,10 +36,7 @@ class GradientPainter : public Painter {
}
}
- virtual ~GradientPainter() {
- delete[] pos_;
- delete[] colors_;
- }
+ virtual ~GradientPainter() {}
// Overridden from Painter:
virtual void Paint(gfx::Canvas* canvas, const gfx::Size& size) OVERRIDE {
@@ -50,8 +48,8 @@ class GradientPainter : public Painter {
else
p[1].iset(0, size.height());
- SkShader* s = SkGradientShader::CreateLinear(p, colors_, pos_, count_,
- SkShader::kClamp_TileMode, NULL);
+ SkShader* s = SkGradientShader::CreateLinear(p, colors_.get(), pos_.get(),
+ count_, SkShader::kClamp_TileMode, NULL);
paint.setStyle(SkPaint::kFill_Style);
paint.setShader(s);
// Need to unref shader, otherwise never deleted.
@@ -66,9 +64,9 @@ class GradientPainter : public Painter {
// If |horizontal_| is true then the gradiant is painted horizontally.
bool horizontal_;
// The gradient colors.
- SkColor* colors_;
+ scoped_array<SkColor> colors_;
// The relative positions of the corresponding gradient colors.
- SkScalar* pos_;
+ scoped_array<SkScalar> pos_;
// The number of elements in |colors_| and |pos_|.
size_t count_;
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698