diff options
| author |  Mike Reed <reed@google.com> | 2016-10-05 14:03:43 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-10-05 18:31:17 +0000 |
| commit | 2b2fc7db4f8a4a4d4a51d7eb4df6aa62e309928d (patch) | |
| tree | cfa3f2de434cb5dcabf98720460105964f78bfc3 /include/core/SkPicture.h | |
| parent | dbb84c268bd09d2aa47256b5315a87f891583b6b (diff) | |
Revert[6] "replace SkXfermode obj with SkBlendMode enum in paints"
- perform version check in CreateProc for XfermodeImageFilter and ArithmeticImageFilter
This reverts commit 3ed485f4249e17abb4b11f5018d03175fd1afb44.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2992
Change-Id: Ib4a154cdd5f5d1dcac921ef50d53b79a2d6a1be8
Reviewed-on: https://skia-review.googlesource.com/2992
Reviewed-by: Mike Reed <reed@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 c398d3a4ec..c2d05f9c41 100644 --- a/include/core/SkPicture.h +++ b/include/core/SkPicture.h @@ -224,10 +224,11 @@ private: // V47: Add occluder rect to SkBlurMaskFilter // V48: Read and write extended SkTextBlobs. // V49: Gradients serialized as SkColor4f + SkColorSpace + // V50: SkXfermode -> SkBlendMode // Only SKPs within the min/current picture version range (inclusive) can be read. static const uint32_t MIN_PICTURE_VERSION = 35; // Produced by Chrome M39. - static const uint32_t CURRENT_PICTURE_VERSION = 49; + static const uint32_t CURRENT_PICTURE_VERSION = 50; static_assert(MIN_PICTURE_VERSION <= 41, "Remove kFontFileName and related code from SkFontDescriptor.cpp."); |