Chromium Code Reviews| Index: src/effects/SkPictureImageFilter.cpp |
| diff --git a/src/effects/SkPictureImageFilter.cpp b/src/effects/SkPictureImageFilter.cpp |
| index 0b36b1d0464b3df59ac581979a91e759f96cb690..b729151d9be45abec6f0184eb3851e07ffda4e14 100644 |
| --- a/src/effects/SkPictureImageFilter.cpp |
| +++ b/src/effects/SkPictureImageFilter.cpp |
| @@ -34,27 +34,27 @@ SkPictureImageFilter::~SkPictureImageFilter() { |
| SkPictureImageFilter::SkPictureImageFilter(SkReadBuffer& buffer) |
| : INHERITED(0, buffer), |
| fPicture(NULL) { |
| -#ifdef SK_ALLOW_PICTUREIMAGEFILTER_SERIALIZATION |
| - if (buffer.readBool()) { |
| - fPicture = SkPicture::CreateFromBuffer(buffer); |
| + if (!buffer.isCrossProcess()) { |
| + if (buffer.readBool()) { |
| + fPicture = SkPicture::CreateFromBuffer(buffer); |
| + } |
| + } else { |
| + buffer.readBool(); |
|
sugoi
2014/05/30 20:24:45
should we check that it's false to make sure we're
|
| } |
| -#else |
| - buffer.readBool(); |
| -#endif |
| buffer.readRect(&fCropRect); |
| } |
| void SkPictureImageFilter::flatten(SkWriteBuffer& buffer) const { |
| this->INHERITED::flatten(buffer); |
| -#ifdef SK_ALLOW_PICTUREIMAGEFILTER_SERIALIZATION |
| - bool hasPicture = (fPicture != NULL); |
| - buffer.writeBool(hasPicture); |
| - if (hasPicture) { |
| - fPicture->flatten(buffer); |
| + if (!buffer.isCrossProcess()) { |
|
sugoi
2014/05/30 20:24:45
could be a bit shorter:
bool hasPicture = !buffer.
|
| + bool hasPicture = (fPicture != NULL); |
| + buffer.writeBool(hasPicture); |
| + if (hasPicture) { |
| + fPicture->flatten(buffer); |
| + } |
| + } else { |
| + buffer.writeBool(false); |
| } |
| -#else |
| - buffer.writeBool(false); |
| -#endif |
| buffer.writeRect(fCropRect); |
| } |