diff options
author | 2014-12-01 10:23:11 -0800 | |
---|---|---|
committer | 2014-12-01 10:23:11 -0800 | |
commit | 52c293547b973f7fb5de3c83f5062b07d759ab88 (patch) | |
tree | fab64afa678274991465ddde70f44e8fdca88c2e /src/effects/SkColorFilterImageFilter.cpp | |
parent | 01d6e5f462d1d52203ee1a6660415877e4cf2dde (diff) |
Remove SK_SUPPORT_LEGACY_DEEPFLATTENING.
This was needed for pictures before v33, and we're now requiring v35+.
Will follow up with the same for skia/ext/pixel_ref_utils_unittest.cc
BUG=skia:
Review URL: https://codereview.chromium.org/769953002
Diffstat (limited to 'src/effects/SkColorFilterImageFilter.cpp')
-rwxr-xr-x | src/effects/SkColorFilterImageFilter.cpp | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/src/effects/SkColorFilterImageFilter.cpp b/src/effects/SkColorFilterImageFilter.cpp index 012f1329a4..10976d77f0 100755 --- a/src/effects/SkColorFilterImageFilter.cpp +++ b/src/effects/SkColorFilterImageFilter.cpp @@ -84,21 +84,6 @@ SkColorFilterImageFilter::SkColorFilterImageFilter(SkColorFilter* cf, : INHERITED(1, &input, cropRect, uniqueID), fColorFilter(SkRef(cf)) { } -#ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING -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 - SkFlattenable* SkColorFilterImageFilter::CreateProc(SkReadBuffer& buffer) { SK_IMAGEFILTER_UNFLATTEN_COMMON(common, 1); SkAutoTUnref<SkColorFilter> cf(buffer.readColorFilter()); |