notice null colorfilter in legacy unflattening

BUG=skia:3117

Review URL: https://codereview.chromium.org/691383003
This commit is contained in:
reed 2014-11-11 13:13:35 -08:00 committed by Commit bot
parent f539b8cdee
commit b969fc0f83

View File

@ -85,9 +85,17 @@ SkColorFilterImageFilter::SkColorFilterImageFilter(SkColorFilter* cf,
}
#ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING
SkColorFilterImageFilter::SkColorFilterImageFilter(SkReadBuffer& buffer)
: INHERITED(1, buffer) {
SkColorFilterImageFilter::SkColorFilterImageFilter(SkReadBuffer& buffer) : INHERITED(1, buffer) {
fColorFilter = buffer.readColorFilter();
// we aren't prepared for this to be NULL, and it can't ever be when we're NOT supporting
// SK_SUPPORT_LEGACY_DEEPFLATTENING, as we always go through a factory which can detect
// NULL. However, since here we're in the legacy code, we assign a dummy filter so we
// don't crash with a null-ptr.
if (NULL == fColorFilter) {
// colormatrix identity is effectively a no-op
fColorFilter = SkColorMatrixFilter::Create(SkColorMatrix());
SkASSERT(fColorFilter);
}
}
#endif