diff options
| author |  Mike Reed <reed@google.com> | 2018-03-08 16:29:12 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-03-08 21:50:51 +0000 |
| commit | d07e4a226a831b433f99c69c3faf449dd41a6c5d (patch) | |
| tree | 8b7b0a324f884eaa319c5b330fda6fd4c4328f88 /include/core/SkPicture.h | |
| parent | 4684f82ebca85d4c7043e5c1028e34cf5631da32 (diff) | |
Change behavior of custom image serial/deserial
New behavior is to *always* call the client's deserial image proc for all data.
This allows the client to make decisions even on "std" image data like PNG.
The change also means that if there is no client deserial image proc, Skia will
still attempt to create an image from the data, even if it was written by a
custom serial proc.
Bug: skia:7706
Change-Id: Ia58bdd10b86d497f02187082c6373c029e9c8293
Reviewed-on: https://skia-review.googlesource.com/113302
Reviewed-by: Florin Malita <fmalita@chromium.org>
Reviewed-by: Leon Scroggins <scroggo@google.com>
Commit-Queue: Mike Reed <reed@google.com>
Diffstat (limited to 'include/core/SkPicture.h')
| -rw-r--r-- | include/core/SkPicture.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/core/SkPicture.h b/include/core/SkPicture.h index b2beb56b86..1a5ecb360b 100644 --- a/include/core/SkPicture.h +++ b/include/core/SkPicture.h @@ -168,10 +168,11 @@ private: // V59: No more LocalSpace option on PictureImageFilter // V60: Remove flags in picture header // V61: Change SkDrawPictureRec to take two colors rather than two alphas + // V62: Don't negate size of custom encoded images (don't write origin x,y either) // Only SKPs within the min/current picture version range (inclusive) can be read. static const uint32_t MIN_PICTURE_VERSION = 56; // august 2017 - static const uint32_t CURRENT_PICTURE_VERSION = 61; + static const uint32_t CURRENT_PICTURE_VERSION = 62; static bool IsValidPictInfo(const SkPictInfo& info); static sk_sp<SkPicture> Forwardport(const SkPictInfo&, |