aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar senorblanco@chromium.org <senorblanco@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81>2012-08-23 18:58:24 +0000
committerGravatar senorblanco@chromium.org <senorblanco@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81>2012-08-23 18:58:24 +0000
commit42e1f0f573eb48fd1ac2a065f2fa764e9d31e0b8 (patch)
tree69f5e4be56819808f9c98e25f838373806ec343a
parent89467c610b249c8c3b6f25c74cb28d5e64ab61d0 (diff)
Workaround for Android crash (unreviewed).
git-svn-id: http://skia.googlecode.com/svn/trunk@5267 2bbb7eff-a529-9590-31e7-b0007b416f81
-rw-r--r--src/effects/SkBlendImageFilter.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/effects/SkBlendImageFilter.cpp b/src/effects/SkBlendImageFilter.cpp
index f4ef9def7f..f637013452 100644
--- a/src/effects/SkBlendImageFilter.cpp
+++ b/src/effects/SkBlendImageFilter.cpp
@@ -92,6 +92,10 @@ bool SkBlendImageFilter::onFilterImage(Proxy* proxy,
SkBitmap* dst,
SkIPoint* offset) {
SkBitmap background, foreground = src;
+ // FIXME: This shouldn't happen, but some reason it does on Android.
+ // (bad serialization?)
+ if (NULL == fBackground)
+ return false;
SkASSERT(NULL != fBackground);
if (!fBackground->filterImage(proxy, src, ctm, &background, offset)) {
return false;