diff options
| author |  reed <reed@google.com> | 2016-03-04 16:36:20 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-03-04 16:36:20 -0800 |
| commit | f70b531daaf47db1ee95c70da9843f1dd1f418d3 (patch) | |
| tree | 85965584497549d7729c301075ff2ec9d1dc2c81 /include/core/SkPicture.h | |
| parent | e77875aa425d51cc8db3463343a6308f9d2aadcc (diff) | |
Move annotations to canvas virtual (patchset #8 id:140001 of https://codereview.chromium.org/1744103002/ )"
Need to land chrome change first https://codereview.chromium.org/1766723003/
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1758023003
TBR=
Review URL: https://codereview.chromium.org/1758023003
Diffstat (limited to 'include/core/SkPicture.h')
| -rw-r--r-- | include/core/SkPicture.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/core/SkPicture.h b/include/core/SkPicture.h index 7c8c187fd8..36f5310230 100644 --- a/include/core/SkPicture.h +++ b/include/core/SkPicture.h @@ -192,10 +192,11 @@ private: // V41: Added serialization of SkBitmapSource's filterQuality parameter // V42: Added a bool to SkPictureShader serialization to indicate did-we-serialize-a-picture? // V43: Added DRAW_IMAGE and DRAW_IMAGE_RECT opt codes to serialized data + // V44: Move annotations from paint to drawAnnotation // 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 = 43; + static const uint32_t CURRENT_PICTURE_VERSION = 44; static_assert(MIN_PICTURE_VERSION <= 41, "Remove kFontFileName and related code from SkFontDescriptor.cpp."); @@ -205,7 +206,7 @@ private: static_assert(MIN_PICTURE_VERSION <= 43, "Remove SkBitmapSourceDeserializer."); - + static bool IsValidPictInfo(const SkPictInfo& info); static SkPicture* Forwardport(const SkPictInfo&, const SkPictureData*); |