diff options
author | 2015-02-25 14:09:45 -0800 | |
---|---|---|
committer | 2015-02-25 14:09:46 -0800 | |
commit | 5f5a8d7599b8e248633ac122294b7a01401fedcb (patch) | |
tree | e598536d87f52a473f82123097418fe6e2dccb6d /src/effects | |
parent | 570d2f81a65fc868d6300a7edf34c0d5d048c5d6 (diff) |
adding preabandon flag to DM
BUG=skia:
Review URL: https://codereview.chromium.org/929243004
Diffstat (limited to 'src/effects')
-rw-r--r-- | src/effects/SkBlurImageFilter.cpp | 3 | ||||
-rw-r--r-- | src/effects/SkBlurMaskFilter.cpp | 3 | ||||
-rw-r--r-- | src/effects/gradients/SkGradientShader.cpp | 3 |
3 files changed, 9 insertions, 0 deletions
diff --git a/src/effects/SkBlurImageFilter.cpp b/src/effects/SkBlurImageFilter.cpp index 32609b8b79..4dcc05e904 100644 --- a/src/effects/SkBlurImageFilter.cpp +++ b/src/effects/SkBlurImageFilter.cpp @@ -280,6 +280,9 @@ bool SkBlurImageFilter::filterImageGPU(Proxy* proxy, const SkBitmap& src, const true, sigma.x(), sigma.y())); + if (!tex) { + return false; + } WrapTexture(tex, rect.width(), rect.height(), result); return true; #else diff --git a/src/effects/SkBlurMaskFilter.cpp b/src/effects/SkBlurMaskFilter.cpp index d7c874cfda..491f5983d8 100644 --- a/src/effects/SkBlurMaskFilter.cpp +++ b/src/effects/SkBlurMaskFilter.cpp @@ -965,6 +965,9 @@ GrFragmentProcessor* GrRRectBlurEffect::Create(GrContext* context, float sigma, texDesc.fConfig = kAlpha_8_GrPixelConfig; blurNinePatchTexture = context->createTexture(texDesc, true, blurred_mask.fImage, 0); + if (!blurNinePatchTexture) { + return NULL; + } context->addResourceToCache(key, blurNinePatchTexture); SkMask::FreeImage(blurred_mask.fImage); diff --git a/src/effects/gradients/SkGradientShader.cpp b/src/effects/gradients/SkGradientShader.cpp index d2b8bc30f8..0f6599dc9a 100644 --- a/src/effects/gradients/SkGradientShader.cpp +++ b/src/effects/gradients/SkGradientShader.cpp @@ -1130,6 +1130,9 @@ GrGradientEffect::GrGradientEffect(GrContext* ctx, fTextureAccess.reset(fAtlas->getTexture(), params); } else { SkAutoTUnref<GrTexture> texture(GrRefCachedBitmapTexture(ctx, bitmap, ¶ms)); + if (!texture) { + return; + } fCoordTransform.reset(kCoordSet, matrix, texture, params.filterMode()); fTextureAccess.reset(texture, params); fYCoord = SK_ScalarHalf; |