diff options
| -rw-r--r-- | src/effects/SkBlendImageFilter.cpp | 4 | ||||
| -rw-r--r-- | src/ports/SkGlobalInitialization_default.cpp | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/effects/SkBlendImageFilter.cpp b/src/effects/SkBlendImageFilter.cpp index f637013452..f4ef9def7f 100644 --- a/src/effects/SkBlendImageFilter.cpp +++ b/src/effects/SkBlendImageFilter.cpp @@ -92,10 +92,6 @@ 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; diff --git a/src/ports/SkGlobalInitialization_default.cpp b/src/ports/SkGlobalInitialization_default.cpp index e9235a8375..28a64143ad 100644 --- a/src/ports/SkGlobalInitialization_default.cpp +++ b/src/ports/SkGlobalInitialization_default.cpp @@ -21,6 +21,7 @@ #include "Sk1DPathEffect.h" #include "Sk2DPathEffect.h" #include "SkAvoidXfermode.h" +#include "SkBitmapSource.h" #include "SkBlendImageFilter.h" #include "SkBlurDrawLooper.h" #include "SkBlurImageFilter.h" @@ -53,6 +54,7 @@ void SkFlattenable::InitializeFlattenables() { SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkAvoidXfermode) SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkBitmapProcShader) + SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkBitmapSource) SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkBlendImageFilter) SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkBlurDrawLooper) SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkBlurImageFilter) |