From 5e0995e4b36178e1e4465a9f50114ed39f038c27 Mon Sep 17 00:00:00 2001 From: "commit-bot@chromium.org" Date: Fri, 7 Feb 2014 12:20:04 +0000 Subject: Revert of Revert "Serialization of SkPictureImageFilter" (https://codereview.chromium.org/153583007/) Reason for revert: New SKPs with version20 are in Google Storage due to http://108.170.219.160:10117/builders/Housekeeper-Nightly-RecreateSKPs/builds/22 Original issue's description: > Revert "Serialization of SkPictureImageFilter" > > This reverts commit 227321b30106e57942929eb96fa5bc22544f6c9e. > > Revert "Sanitizing source files in Housekeeper-Nightly" > > This reverts commit baf28584b7636c01355f8d8d972e06aa7fb66d77. > > TBR=robertphillips@google.com,sugoi@google.com > > Committed: https://code.google.com/p/skia/source/detail?r=13356 R=robertphillips@google.com, sugoi@google.com, fmalita@google.com, fmalita@chromium.org TBR=fmalita@chromium.org, fmalita@google.com, robertphillips@google.com, sugoi@google.com NOTREECHECKS=true NOTRY=true Author: rmistry@google.com Review URL: https://codereview.chromium.org/143163005 git-svn-id: http://skia.googlecode.com/svn/trunk@13357 2bbb7eff-a529-9590-31e7-b0007b416f81 --- src/effects/SkPictureImageFilter.cpp | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) (limited to 'src/effects') diff --git a/src/effects/SkPictureImageFilter.cpp b/src/effects/SkPictureImageFilter.cpp index c78b2499ec..6e76231867 100644 --- a/src/effects/SkPictureImageFilter.cpp +++ b/src/effects/SkPictureImageFilter.cpp @@ -34,13 +34,27 @@ SkPictureImageFilter::~SkPictureImageFilter() { SkPictureImageFilter::SkPictureImageFilter(SkReadBuffer& buffer) : INHERITED(0, buffer), fPicture(NULL) { - // FIXME: unflatten picture here. +#ifdef SK_ALLOW_PICTUREIMAGEFILTER_SERIALIZATION + if (buffer.readBool()) { + fPicture = SkPicture::CreateFromBuffer(buffer); + } +#else + buffer.readBool(); +#endif buffer.readRect(&fRect); } void SkPictureImageFilter::flatten(SkWriteBuffer& buffer) const { this->INHERITED::flatten(buffer); - // FIXME: flatten picture here. +#ifdef SK_ALLOW_PICTUREIMAGEFILTER_SERIALIZATION + bool hasPicture = (fPicture != NULL); + buffer.writeBool(hasPicture); + if (hasPicture) { + fPicture->flatten(buffer); + } +#else + buffer.writeBool(false); +#endif buffer.writeRect(fRect); } -- cgit v1.2.3