don't leak test filters and shaders

gm/colorfilterimagefilter.cpp

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "gm.h"
 #include "SkCanvas.h"
 #include "SkColorMatrixFilter.h"
@@ skipping 24 matching lines @@
     matrix[1] = matrix[6] = matrix[11] = 0.7152f;
     matrix[2] = matrix[7] = matrix[12] = 0.0722f;
     matrix[18] = 1.0f;
     return SkColorMatrixFilter::Create(matrix);
 }
 
 static SkColorFilter* cf_make_colorize(SkColor color) {
     return SkColorFilter::CreateModeFilter(color, SkXfermode::kSrc_Mode);
 }
 
-static const SkTDArray<SkColorFilter*>& sk_gm_get_colorfilters() {
-    static SkTDArray<SkColorFilter*> gColorFilters;
-    
-    if (gColorFilters.count() == 0) {
-        *gColorFilters.append() = cf_make_brightness(0.5f);
-        *gColorFilters.append() = cf_make_grayscale();
-        *gColorFilters.append() = cf_make_colorize(SK_ColorBLUE);
-    }
-    return gColorFilters;
+static void sk_gm_get_colorfilters(SkTDArray<SkColorFilter*>* array) {
+    *array->append() = cf_make_brightness(0.5f);
+    *array->append() = cf_make_grayscale();
+    *array->append() = cf_make_colorize(SK_ColorBLUE);
 }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 #include "SkGradientShader.h"
 #include "SkImage.h"
 #include "Resources.h"
 
 static SkShader* sh_make_lineargradient0() {
     const SkPoint pts[] = { { 0, 0 }, { 100, 100 } };
     const SkColor colors[] = { SK_ColorRED, SK_ColorGREEN, SK_ColorBLUE };
     return SkGradientShader::CreateLinear(pts, colors, nullptr, 3, SkShader::kRepeat_TileMode);
 }
 
 static SkShader* sh_make_lineargradient1() {
     const SkPoint pts[] = { { 0, 0 }, { 100, 100 } };
     const SkColor colors[] = { SK_ColorRED, 0x0000FF00, SK_ColorBLUE };
     return SkGradientShader::CreateLinear(pts, colors, nullptr, 3, SkShader::kRepeat_TileMode);
 }
 
 static SkShader* sh_make_image() {
     SkAutoTUnref<SkImage> image(GetResourceAsImage("mandrill_128.png"));
     return image->newShader(SkShader::kRepeat_TileMode, SkShader::kRepeat_TileMode);
 }
 
-static const SkTDArray<SkShader*>& sk_gm_get_shaders() {
-    static SkTDArray<SkShader*> gShaders;
-    
-    if (gShaders.count() == 0) {
-        *gShaders.append() = sh_make_lineargradient0();
-        *gShaders.append() = sh_make_lineargradient1();
-        *gShaders.append() = sh_make_image();
-    }
-    return gShaders;
+static void sk_gm_get_shaders(SkTDArray<SkShader*>* array) {
+    *array->append() = sh_make_lineargradient0();
+    *array->append() = sh_make_lineargradient1();
+    *array->append() = sh_make_image();
 }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 static SkImageFilter* make_blur(float amount, SkImageFilter* input = nullptr) {
     return SkBlurImageFilter::Create(amount, amount, input);
 }
 
 static SkImageFilter* make_brightness(float amount, SkImageFilter* input = nullptr) {
     SkAutoTUnref<SkColorFilter> filter(cf_make_brightness(amount));
@@ skipping 86 matching lines @@
     SkAutoTUnref<SkColorFilter> cf(SkColorMatrixFilter::Create(cm));
     SkAutoTUnref<SkImageFilter> imf(SkColorFilterImageFilter::Create(cf));
     SkPaint p;
     p.setImageFilter(imf);
     canvas->saveLayer(NULL, &p);
     canvas->clear(SK_ColorRED);
 }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
+template <typename T> class SkTRefArray : public SkTDArray<T> {
+public:
+    ~SkTRefArray() { this->unrefAll(); }
+};
+
 DEF_SIMPLE_GM(colorfiltershader, canvas, 800, 800) {
-    const SkTDArray<SkColorFilter*>& filters = sk_gm_get_colorfilters();
-    const SkTDArray<SkShader*>& shaders = sk_gm_get_shaders();
+    SkTRefArray<SkColorFilter*> filters;
+    sk_gm_get_colorfilters(&filters);
+
+    SkTRefArray<SkShader*> shaders;
+    sk_gm_get_shaders(&shaders);
 
     SkPaint paint;
     SkRect r = SkRect::MakeWH(120, 120);
 
     canvas->translate(20, 20);
     for (int y = 0; y < shaders.count(); ++y) {
         SkShader* shader = shaders[y];
         
         canvas->save();
         for (int x = -1; x < filters.count(); ++x) {
             SkColorFilter* filter = x >= 0 ? filters[x] : nullptr;
 
             paint.setShader(shader->newWithColorFilter(filter))->unref();
             canvas->drawRect(r, paint);
             canvas->translate(150, 0);
         }
         canvas->restore();
         canvas->translate(0, 150);
     }
 }