diff options
| author |  robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-12-13 15:24:37 +0000 |
|---|---|---|
| committer | robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-12-13 15:24:37 +0000 |
| commit | 0daa1adb03b4b1fc11d854cb7754416ac05a31e8 (patch) | |
| tree | 65250ae1cb608dbebfa25e96c3c31335379ccd3a /include/core/SkPicture.h | |
| parent | 3c5f29a8a5f8113a831f132f1bb3d839d9fb285a (diff) | |
Reverting r12665 & r12666 (Remove duplicate impl for SkImageInfo flattening) due to Chromium/Blink compilation errors
https://codereview.chromium.org/112603003/
git-svn-id: http://skia.googlecode.com/svn/trunk@12667 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'include/core/SkPicture.h')
| -rw-r--r-- | include/core/SkPicture.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/core/SkPicture.h b/include/core/SkPicture.h index cd6b3bcbb1..bce343ec04 100644 --- a/include/core/SkPicture.h +++ b/include/core/SkPicture.h @@ -220,11 +220,10 @@ protected: // V14: Add flags word to PathRef serialization // V15: Remove A1 bitmpa config (and renumber remaining configs) // V16: Move SkPath's isOval flag to SkPathRef - // V17: Changes to PixelRef to store SkImageInfo #ifndef DELETE_THIS_CODE_WHEN_SKPS_ARE_REBUILT_AT_V16_AND_ALL_OTHER_INSTANCES_TOO static const uint32_t PRIOR_PICTURE_VERSION = 15; // TODO: remove when .skps regenerated #endif - static const uint32_t PICTURE_VERSION = 17; + static const uint32_t PICTURE_VERSION = 16; // fPlayback, fRecord, fWidth & fHeight are protected to allow derived classes to // install their own SkPicturePlayback-derived players,SkPictureRecord-derived |