diff options
| author |  reed <reed@google.com> | 2016-08-10 06:37:43 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-08-10 06:37:43 -0700 |
| commit | d5b88a3dc500c16fc56d472acad01e78d56ef14a (patch) | |
| tree | 57b5fd475382ca1cb51ca9ffa714e2707165e214 /src/core/SkPictureData.cpp | |
| parent | 1bd13ca922d6448d595064faee486eaf3fa56e56 (diff) | |
remove support for serializing bitmaps in old format
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2230973002
Review-Url: https://codereview.chromium.org/2230973002
Diffstat (limited to 'src/core/SkPictureData.cpp')
| -rw-r--r-- | src/core/SkPictureData.cpp | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/core/SkPictureData.cpp b/src/core/SkPictureData.cpp index 873c0c4a1d..1e946aaa97 100644 --- a/src/core/SkPictureData.cpp +++ b/src/core/SkPictureData.cpp @@ -43,7 +43,7 @@ SkPictureData::SkPictureData(const SkPictureRecord& record, fContentInfo.set(record.fContentInfo); - fBitmaps = record.fBitmaps; + fBitmaps.reset(); // we never make bitmaps (anymore) during recording fPaints = record.fPaints; fPaths.reset(record.fPaths.count()); @@ -223,12 +223,8 @@ void SkPictureData::WriteTypefaces(SkWStream* stream, const SkRefCntSet& rec) { void SkPictureData::flattenToBuffer(SkWriteBuffer& buffer) const { int i, n; - if ((n = fBitmaps.count()) > 0) { - write_tag_size(buffer, SK_PICT_BITMAP_BUFFER_TAG, n); - for (i = 0; i < n; i++) { - buffer.writeBitmap(fBitmaps[i]); - } - } + // we never record bitmaps anymore, only images + SkASSERT(fBitmaps.count() == 0); if ((n = fPaints.count()) > 0) { write_tag_size(buffer, SK_PICT_PAINT_BUFFER_TAG, n); |