Allow supporting older PICTURE_VERSIONs.

src/core/SkOrderedReadBuffer.cpp

 
 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkBitmap.h"
 #include "SkErrorInternals.h"
 #include "SkOrderedReadBuffer.h"
 #include "SkStream.h"
 #include "SkTypeface.h"
 
 SkOrderedReadBuffer::SkOrderedReadBuffer() : INHERITED() {
     fMemoryPtr = NULL;
 
     fBitmapStorage = NULL;
     fTFArray = NULL;
     fTFCount = 0;
 
     fFactoryTDArray = NULL;
     fFactoryArray = NULL;
     fFactoryCount = 0;
     fBitmapDecoder = NULL;
+    fPictureVersion = SkPicture::PICTURE_VERSION;
 }
 
 SkOrderedReadBuffer::SkOrderedReadBuffer(const void* data, size_t size) : INHERITED()  {
     fReader.setMemory(data, size);
     fMemoryPtr = NULL;
 
     fBitmapStorage = NULL;
     fTFArray = NULL;
     fTFCount = 0;
 
     fFactoryTDArray = NULL;
     fFactoryArray = NULL;
     fFactoryCount = 0;
     fBitmapDecoder = NULL;
+    fPictureVersion = SkPicture::PICTURE_VERSION;
 }
 
 SkOrderedReadBuffer::SkOrderedReadBuffer(SkStream* stream) {
     const size_t length = stream->getLength();
     fMemoryPtr = sk_malloc_throw(length);
     stream->read(fMemoryPtr, length);
     fReader.setMemory(fMemoryPtr, length);
 
     fBitmapStorage = NULL;
     fTFArray = NULL;
     fTFCount = 0;
 
     fFactoryTDArray = NULL;
     fFactoryArray = NULL;
     fFactoryCount = 0;
     fBitmapDecoder = NULL;
+    fPictureVersion = SkPicture::PICTURE_VERSION;
 }
 
 SkOrderedReadBuffer::~SkOrderedReadBuffer() {
     sk_free(fMemoryPtr);
     SkSafeUnref(fBitmapStorage);
 }
 
 bool SkOrderedReadBuffer::readBool() {
     return fReader.readBool();
 }
@@ skipping 95 matching lines @@
     const uint32_t count = fReader.readU32();
     const uint32_t byteLength = count * sizeof(SkScalar);
     memcpy(values, fReader.skip(SkAlign4(byteLength)), byteLength);
     return count;
 }
 
 uint32_t SkOrderedReadBuffer::getArrayCount() {
     return *(uint32_t*)fReader.peek();
 }
 
+void SkOrderedReadBuffer::setPictureVersion(uint32_t version) {
+    SkASSERT(version <= SkPicture::PICTURE_VERSION);
+    fPictureVersion = version;
+}
+
 void SkOrderedReadBuffer::readBitmap(SkBitmap* bitmap) {
-    const int width = this->readInt();
-    const int height = this->readInt();
-    // The writer stored a boolean value to determine whether an SkBitmapHeap was used during
-    // writing.
-    if (this->readBool()) {
-        // An SkBitmapHeap was used for writing. Read the index from the stream and find the
-        // corresponding SkBitmap in fBitmapStorage.
-        const uint32_t index = fReader.readU32();
-        fReader.readU32(); // bitmap generation ID (see SkOrderedWriteBuffer::writeBitmap)
-        if (fBitmapStorage) {
-            *bitmap = *fBitmapStorage->getBitmap(index);
-            fBitmapStorage->releaseRef(index);
-            return;
+    if (10 == fPictureVersion) {

[scroggo, 2013/04/29 18:50:41]

codereview makes this unobvious, but the only change in this function is that it
now does:

if (10 == fPictureVersion) {
  // readBitmap before https://codereview.chromium.org/14230022/
} else {
  // readBitmap as in https://codereview.chromium.org/14230022/
}

+        // Old code to read a bitmap in PICTURE_VERSION 10
+        const size_t length = this->readUInt();
+        if (length > 0) {
+            // Bitmap was encoded.
+            const void* data = this->skip(length);
+            const int width = this->readInt();
+            const int height = this->readInt();
+            if (fBitmapDecoder != NULL && fBitmapDecoder(data, length, bitmap)) {
+                SkASSERT(bitmap->width() == width && bitmap->height() == height);
+            } else {
+                // This bitmap was encoded when written, but we are unable to decode, possibly due to

[scroggo, 2013/04/29 18:50:41]

100 chars

+                // not having a decoder. Use a placeholder bitmap.
+                SkErrorInternals::SetError(kParseError_SkError,
+                                           "Could not decode bitmap. Resulting bitmap will be red.");

[scroggo, 2013/04/29 18:50:41]

100 chars

+                bitmap->setConfig(SkBitmap::kARGB_8888_Config, width, height);
+                bitmap->allocPixels();
+                bitmap->eraseColor(SK_ColorRED);
+            }
         } else {
-            // The bitmap was stored in a heap, but there is no way to access it. Set an error and
-            // fall through to use a place holder bitmap.
-            SkErrorInternals::SetError(kParseError_SkError, "SkOrderedWriteBuffer::writeBitmap "
-                                       "stored the SkBitmap in an SkBitmapHeap, but "
-                                       "SkOrderedReadBuffer has no SkBitmapHeapReader to "
-                                       "retrieve the SkBitmap.");
+            if (fBitmapStorage) {
+                const uint32_t index = fReader.readU32();
+                fReader.readU32(); // bitmap generation ID (see SkOrderedWriteBuffer::writeBitmap)
+                *bitmap = *fBitmapStorage->getBitmap(index);
+                fBitmapStorage->releaseRef(index);
+            } else {
+                bitmap->unflatten(*this);
+            }
         }
     } else {
-        // The writer stored false, meaning the SkBitmap was not stored in an SkBitmapHeap.
-        const size_t length = this->readUInt();
-        if (length > 0) {
-            // A non-zero size means the SkBitmap was encoded.
-            const void* data = this->skip(length);
-            if (fBitmapDecoder != NULL && fBitmapDecoder(data, length, bitmap)) {
-                SkASSERT(bitmap->width() == width && bitmap->height() == height);
+        const int width = this->readInt();
+        const int height = this->readInt();
+        // The writer stored a boolean value to determine whether an SkBitmapHeap was used during
+        // writing.
+        if (this->readBool()) {
+            // An SkBitmapHeap was used for writing. Read the index from the stream and find the
+            // corresponding SkBitmap in fBitmapStorage.
+            const uint32_t index = fReader.readU32();
+            fReader.readU32(); // bitmap generation ID (see SkOrderedWriteBuffer::writeBitmap)
+            if (fBitmapStorage) {
+                *bitmap = *fBitmapStorage->getBitmap(index);
+                fBitmapStorage->releaseRef(index);
+                return;
+            } else {
+                // The bitmap was stored in a heap, but there is no way to access it. Set an error and

[scroggo, 2013/04/29 18:50:41]

100 chars

+                // fall through to use a place holder bitmap.
+                SkErrorInternals::SetError(kParseError_SkError, "SkOrderedWriteBuffer::writeBitmap "
+                                           "stored the SkBitmap in an SkBitmapHeap, but "
+                                           "SkOrderedReadBuffer has no SkBitmapHeapReader to "
+                                           "retrieve the SkBitmap.");
+            }
+        } else {
+            // The writer stored false, meaning the SkBitmap was not stored in an SkBitmapHeap.
+            const size_t length = this->readUInt();
+            if (length > 0) {
+                // A non-zero size means the SkBitmap was encoded.
+                const void* data = this->skip(length);
+                if (fBitmapDecoder != NULL && fBitmapDecoder(data, length, bitmap)) {
+                    SkASSERT(bitmap->width() == width && bitmap->height() == height);
+                    return;
+                }
+                // This bitmap was encoded when written, but we are unable to decode, possibly due to

[scroggo, 2013/04/29 18:50:41]

100 chars

+                // not having a decoder.
+                SkErrorInternals::SetError(kParseError_SkError,
+                                           "Could not decode bitmap. Resulting bitmap will be red.");

[scroggo, 2013/04/29 18:50:41]

100 chars

+            } else {
+                // A size of zero means the SkBitmap was simply flattened.
+                bitmap->unflatten(*this);
                 return;
             }
-            // This bitmap was encoded when written, but we are unable to decode, possibly due to
-            // not having a decoder.
-            SkErrorInternals::SetError(kParseError_SkError,
-                                       "Could not decode bitmap. Resulting bitmap will be red.");
-        } else {
-            // A size of zero means the SkBitmap was simply flattened.
-            bitmap->unflatten(*this);
-            return;
         }
+        // Could not read the SkBitmap. Use a placeholder bitmap.
+        bitmap->setConfig(SkBitmap::kARGB_8888_Config, width, height);
+        bitmap->allocPixels();
+        bitmap->eraseColor(SK_ColorRED);
     }
-    // Could not read the SkBitmap. Use a placeholder bitmap.
-    bitmap->setConfig(SkBitmap::kARGB_8888_Config, width, height);
-    bitmap->allocPixels();
-    bitmap->eraseColor(SK_ColorRED);
 }
 
 SkTypeface* SkOrderedReadBuffer::readTypeface() {
 
     uint32_t index = fReader.readU32();
     if (0 == index || index > (unsigned)fTFCount) {
         if (index) {
             SkDebugf("====== typeface index %d\n", index);
         }
         return NULL;
@@ skipping 40 matching lines @@
         if (sizeRecorded != sizeRead) {
             // we could try to fix up the offset...
             sk_throw();
         }
     } else {
         // we must skip the remaining data
         fReader.skip(sizeRecorded);
     }
     return obj;
 }