diff options
| author |  Mike Reed <reed@google.com> | 2018-02-07 15:16:28 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-02-07 20:38:52 +0000 |
| commit | 10b98780d05b0d6c321b515ef4e8defdc6948531 (patch) | |
| tree | e828cefa042e3deda0fadb282b2f916b9d562b71 /src | |
| parent | 2179b78ef221b6df73f1b8a085e5ca86e85a525b (diff) | |
check for failed snapshot
Bug: skia:7596
Change-Id: I4846cb0874c075244e5f53da8fc3210362172940
Reviewed-on: https://skia-review.googlesource.com/105361
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/effects/SkTileImageFilter.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/effects/SkTileImageFilter.cpp b/src/effects/SkTileImageFilter.cpp index a90f98d781..0a1eb39aa3 100644 --- a/src/effects/SkTileImageFilter.cpp +++ b/src/effects/SkTileImageFilter.cpp @@ -75,9 +75,6 @@ sk_sp<SkSpecialImage> SkTileImageFilter::onFilterImage(SkSpecialImage* source, sk_sp<SkImage> subset; if (inputBounds.contains(srcIRect)) { subset = input->asImage(&srcIRect); - if (!subset) { - return nullptr; - } } else { sk_sp<SkSurface> surf(input->makeTightSurface(ctx.outputProperties(), srcIRect.size())); if (!surf) { @@ -96,6 +93,9 @@ sk_sp<SkSpecialImage> SkTileImageFilter::onFilterImage(SkSpecialImage* source, subset = surf->makeImageSnapshot(); } + if (!subset) { + return nullptr; + } SkASSERT(subset->width() == srcIRect.width()); SkASSERT(subset->height() == srcIRect.height()); |