aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/effects/SkMergeImageFilter.cpp
diff options
context:
space:
mode:
authorGravatar mtklein <mtklein@chromium.org>2014-12-01 10:23:11 -0800
committerGravatar Commit bot <commit-bot@chromium.org>2014-12-01 10:23:11 -0800
commit52c293547b973f7fb5de3c83f5062b07d759ab88 (patch)
treefab64afa678274991465ddde70f44e8fdca88c2e /src/effects/SkMergeImageFilter.cpp
parent01d6e5f462d1d52203ee1a6660415877e4cf2dde (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/SkMergeImageFilter.cpp')
-rwxr-xr-xsrc/effects/SkMergeImageFilter.cpp21
1 files changed, 0 insertions, 21 deletions
diff --git a/src/effects/SkMergeImageFilter.cpp b/src/effects/SkMergeImageFilter.cpp
index 9e7f4e543c..d932d3ccce 100755
--- a/src/effects/SkMergeImageFilter.cpp
+++ b/src/effects/SkMergeImageFilter.cpp
@@ -140,24 +140,3 @@ void SkMergeImageFilter::flatten(SkWriteBuffer& buffer) const {
buffer.writeByteArray(fModes, countInputs() * sizeof(fModes[0]));
}
}
-
-#ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING
-SkMergeImageFilter::SkMergeImageFilter(SkReadBuffer& buffer)
- : INHERITED(-1, buffer) {
- bool hasModes = buffer.readBool();
- if (hasModes) {
- this->initAllocModes();
- int nbInputs = countInputs();
- size_t size = nbInputs * sizeof(fModes[0]);
- SkASSERT(buffer.getArrayCount() == size);
- if (buffer.validate(buffer.getArrayCount() == size) &&
- buffer.readByteArray(fModes, size)) {
- for (int i = 0; i < nbInputs; ++i) {
- buffer.validate(SkIsValidMode((SkXfermode::Mode)fModes[i]));
- }
- }
- } else {
- fModes = 0;
- }
-}
-#endif