aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar robertphillips <robertphillips@google.com>2015-08-21 08:24:22 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2015-08-21 08:24:22 -0700
commit850f2d9c097575484d9438abdc3b1b8ac60d589c (patch)
treedf308ac66f8a7a2d535a66a2682886bf9fd46460
parentb4fd893fb080697fc265f52233042502e9fa2615 (diff)
Return failure if getInputResultsGPU fails in SkXfermodeImageFilter
SkXfermodeImageFilter::filterImageGPU is the only call site that does anything fancy when getInputResultsGPU fails. It seems like we can just return like everyone else (for uniformity). Review URL: https://codereview.chromium.org/1302033004
-rw-r--r--src/effects/SkXfermodeImageFilter.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/effects/SkXfermodeImageFilter.cpp b/src/effects/SkXfermodeImageFilter.cpp
index dc61b4e76e..e014cc0471 100644
--- a/src/effects/SkXfermodeImageFilter.cpp
+++ b/src/effects/SkXfermodeImageFilter.cpp
@@ -135,7 +135,7 @@ bool SkXfermodeImageFilter::filterImageGPU(Proxy* proxy,
SkIPoint backgroundOffset = SkIPoint::Make(0, 0);
if (this->getInput(0) &&
!this->getInput(0)->getInputResultGPU(proxy, src, ctx, &background, &backgroundOffset)) {
- return this->onFilterImage(proxy, src, ctx, result, offset);
+ return false;
}
GrTexture* backgroundTex = background.getTexture();
@@ -148,7 +148,7 @@ bool SkXfermodeImageFilter::filterImageGPU(Proxy* proxy,
SkIPoint foregroundOffset = SkIPoint::Make(0, 0);
if (this->getInput(1) &&
!this->getInput(1)->getInputResultGPU(proxy, src, ctx, &foreground, &foregroundOffset)) {
- return this->onFilterImage(proxy, src, ctx, result, offset);
+ return false;
}
GrTexture* foregroundTex = foreground.getTexture();
GrContext* context = foregroundTex->getContext();