diff options
| author |  Robert Phillips <robertphillips@google.com> | 2017-02-10 12:32:08 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-02-10 12:32:21 +0000 |
| commit | 19c22e946dd9f18de82f7728db80934efe262847 (patch) | |
| tree | c456f09aaf8dc3039dc12d6f838125fb7d4fbf60 /include/core/SkPicture.h | |
| parent | b8b51e6b2f431c89907139bec52ed64b7ed303ed (diff) | |
Revert "Roll minimum picture version up to 44."
This reverts commit e037d12625b1dbb7952ae8a6553d6830e8b3ebbf.
Reason for revert: Checking to see if this broke the Chrome DEPS roll
Original change's description:
> Roll minimum picture version up to 44.
>
> This is the version produced by Chrome M54. M56 is stable now.
>
> I am most interested in deleting SkBitmapSourceDeserializer,
> because it awkwardly calls from core into effects (SkImageSource).
>
> Change-Id: I58b8b990017ba43372ab3333a4ef8312e75abc61
> Reviewed-on: https://skia-review.googlesource.com/8286
> Reviewed-by: Mike Reed <reed@google.com>
> Commit-Queue: Mike Klein <mtklein@chromium.org>
>
TBR=mtklein@chromium.org,reed@google.com,reviews@skia.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Change-Id: I9202591c7945c9421f335e544bf12461e38acdc6
Reviewed-on: https://skia-review.googlesource.com/8305
Commit-Queue: Robert Phillips <robertphillips@google.com>
Reviewed-by: Robert Phillips <robertphillips@google.com>
Diffstat (limited to 'include/core/SkPicture.h')
| -rw-r--r-- | include/core/SkPicture.h | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/include/core/SkPicture.h b/include/core/SkPicture.h index 29525953e2..8047858b16 100644 --- a/include/core/SkPicture.h +++ b/include/core/SkPicture.h @@ -201,9 +201,18 @@ private: // V51: more SkXfermode -> SkBlendMode // Only SKPs within the min/current picture version range (inclusive) can be read. - static const uint32_t MIN_PICTURE_VERSION = 44; // Produced by Chrome M54 + static const uint32_t MIN_PICTURE_VERSION = 35; // Produced by Chrome M39. static const uint32_t CURRENT_PICTURE_VERSION = 51; + static_assert(MIN_PICTURE_VERSION <= 41, + "Remove kFontFileName and related code from SkFontDescriptor.cpp."); + + static_assert(MIN_PICTURE_VERSION <= 42, + "Remove COMMENT API handlers from SkPicturePlayback.cpp"); + + static_assert(MIN_PICTURE_VERSION <= 43, + "Remove SkBitmapSourceDeserializer."); + static_assert(MIN_PICTURE_VERSION <= 45, "Remove decoding of old SkTypeface::Style from SkFontDescriptor.cpp."); |