release the scanline textures in GrRectBlurEffect

src/effects/SkBlurMaskFilter.cpp

 
 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkBlurMaskFilter.h"
 #include "SkBlurMask.h"
@@ skipping 509 matching lines @@
     typedef GrGLRectBlurEffect GLEffect;
 
     virtual const GrBackendEffectFactory& getFactory() const SK_OVERRIDE;
     virtual void getConstantColorComponents(GrColor* color, uint32_t* validFlags) const SK_OVERRIDE;
 
     /**
      * Create a simple filter effect with custom bicubic coefficients.
      */
     static GrEffectRef* Create(GrContext *context, const SkRect& rect,
                                float sigma) {
-        GrTexture *horizontalScanline, *verticalScanline;
+        GrTexture *horizontalScanline = NULL, *verticalScanline = NULL;
         bool createdScanlines = CreateScanlineTextures(context, sigma,
                                                        SkScalarCeilToInt(rect.width()),
                                                        SkScalarCeilToInt(rect.height()),
                                                        &horizontalScanline, &verticalScanline);

[robertphillips, 2014/01/31 13:33:10]

Won't this potentially cause a problem if the horizontal texture gets created
(and unrefed in CreateScanlineTextures) but the vertical texture doesn't get
created. Don't we also need to set horizontalScanline to NULL in that case (in
CreateScanlineTextures)?

[humper, 2014/01/31 13:51:17]

yeah, I'll land a better fix for this once this patch arrives.

-        if (!createdScanlines) {
+         SkAutoTUnref<GrTexture> hunref(horizontalScanline), vunref(verticalScanline);
+         if (!createdScanlines) {
             return NULL;
         }
         AutoEffectUnref effect(SkNEW_ARGS(GrRectBlurEffect, (rect, sigma,
                                                              horizontalScanline, verticalScanline)));
-        return CreateEffectRef(effect);
+        return CreateEffectRef(effect);    
     }
 
     unsigned int getWidth() const { return fWidth; }
     unsigned int getHeight() const { return fHeight; }
     float getSigma() const { return fSigma; }
     const GrCoordTransform& getTransform() const { return fTransform; }
 
 private:
     GrRectBlurEffect(const SkRect& rect, float sigma,
                      GrTexture *horizontal_scanline, GrTexture *vertical_scanline);
@@ skipping 128 matching lines @@
             ada.reset(profile);
         }
 
         SkAutoTMalloc<uint8_t> verticalPixels(height);
         SkBlurMask::ComputeBlurredScanline(verticalPixels, profile, height, sigma);
 
         *verticalScanline = context->createTexture(&params, texDesc, verticalCacheID,
                                                    verticalPixels, 0);
 
         if (NULL == *verticalScanline) {
+            (*horizontalScanline)->unref();
             return false;
         }
 
     }
     return true;
 }
 
 GrRectBlurEffect::GrRectBlurEffect(const SkRect& rect, float sigma,
                                    GrTexture *horizontal_scanline, GrTexture *vertical_scanline)
   : INHERITED(),
@@ skipping 196 matching lines @@
     } else {
         str->append("None");
     }
     str->append("))");
 }
 #endif
 
 SK_DEFINE_FLATTENABLE_REGISTRAR_GROUP_START(SkBlurMaskFilter)
     SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkBlurMaskFilterImpl)
 SK_DEFINE_FLATTENABLE_REGISTRAR_GROUP_END