From 6e78293ee896020104ffc4c23b565073e9a49893 Mon Sep 17 00:00:00 2001 From: mtklein Date: Mon, 1 Dec 2014 10:56:05 -0800 Subject: Revert of Remove SK_SUPPORT_LEGACY_DEEPFLATTENING. (patchset #1 id:1 of https://codereview.chromium.org/769953002/) Reason for revert: Breaks canary builds. Will reland after the Chromium change lands. Original issue's description: > 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: > > Committed: https://skia.googlesource.com/skia/+/52c293547b973f7fb5de3c83f5062b07d759ab88 TBR=reed@google.com,mtklein@chromium.org NOTREECHECKS=true NOTRY=true BUG=skia: Review URL: https://codereview.chromium.org/768183002 --- include/effects/SkMergeImageFilter.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'include/effects/SkMergeImageFilter.h') diff --git a/include/effects/SkMergeImageFilter.h b/include/effects/SkMergeImageFilter.h index 59183e3fc1..5e723aa290 100644 --- a/include/effects/SkMergeImageFilter.h +++ b/include/effects/SkMergeImageFilter.h @@ -38,6 +38,9 @@ protected: const SkXfermode::Mode modes[], const CropRect* cropRect, uint32_t uniqueID); +#ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING + explicit SkMergeImageFilter(SkReadBuffer& buffer); +#endif virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE; virtual bool onFilterImage(Proxy*, const SkBitmap& src, const Context&, -- cgit v1.2.3