Remove SkBitmapHeap and SkBitmapHeapReader. They're unused.

src/core/SkWriteBuffer.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 "SkWriteBuffer.h"
 #include "SkBitmap.h"
-#include "SkBitmapHeap.h"
 #include "SkData.h"
 #include "SkPixelRef.h"
 #include "SkPtrRecorder.h"
 #include "SkStream.h"
 #include "SkTypeface.h"
 
 SkWriteBuffer::SkWriteBuffer(uint32_t flags)
     : fFlags(flags)
     , fFactorySet(nullptr)
-    , fBitmapHeap(nullptr)
     , fTFSet(nullptr) {
 }
 
 SkWriteBuffer::SkWriteBuffer(void* storage, size_t storageSize, uint32_t flags)
     : fFlags(flags)
     , fFactorySet(nullptr)
     , fWriter(storage, storageSize)
-    , fBitmapHeap(nullptr)
     , fTFSet(nullptr) {
 }
 
 SkWriteBuffer::~SkWriteBuffer() {
     SkSafeUnref(fFactorySet);
-    SkSafeUnref(fBitmapHeap);
     SkSafeUnref(fTFSet);
 }
 
 void SkWriteBuffer::writeByteArray(const void* data, size_t size) {
     fWriter.write32(SkToU32(size));
     fWriter.writePad(data, size);
 }
 
 void SkWriteBuffer::writeBool(bool value) {
     fWriter.writeBool(value);
@@ skipping 87 matching lines @@
     buffer->write32(origin.fX);
     buffer->write32(origin.fY);
 }
 
 void SkWriteBuffer::writeBitmap(const SkBitmap& bitmap) {
     // Record the width and height. This way if readBitmap fails a dummy bitmap can be drawn at the
     // right size.
     this->writeInt(bitmap.width());
     this->writeInt(bitmap.height());
 
-    // Record information about the bitmap in one of three ways, in order of priority:
-    // 1. If there is an SkBitmapHeap, store it in the heap. The client can avoid serializing the
-    //    bitmap entirely or serialize it later as desired. A boolean value of true will be written
-    //    to the stream to signify that a heap was used.
-    // 2. If there is a function for encoding bitmaps, use it to write an encoded version of the
+    // Record information about the bitmap in one of two ways, in order of priority:
+    // 1. If there is a function for encoding bitmaps, use it to write an encoded version of the
     //    bitmap. After writing a boolean value of false, signifying that a heap was not used, write
     //    the size of the encoded data. A non-zero size signifies that encoded data was written.
-    // 3. Call SkBitmap::flatten. After writing a boolean value of false, signifying that a heap was
+    // 2. Call SkBitmap::flatten. After writing a boolean value of false, signifying that a heap was
     //    not used, write a zero to signify that the data was not encoded.
-    bool useBitmapHeap = fBitmapHeap != nullptr;
-    // Write a bool: true if the SkBitmapHeap is to be used, in which case the reader must use an
-    // SkBitmapHeapReader to read the SkBitmap. False if the bitmap was serialized another way.
-    this->writeBool(useBitmapHeap);
-    if (useBitmapHeap) {
-        SkASSERT(nullptr == fPixelSerializer);
-        int32_t slot = fBitmapHeap->insert(bitmap);
-        fWriter.write32(slot);
-        // crbug.com/155875
-        // The generation ID is not required information. We write it to prevent collisions
-        // in SkFlatDictionary.  It is possible to get a collision when a previously
-        // unflattened (i.e. stale) instance of a similar flattenable is in the dictionary
-        // and the instance currently being written is re-using the same slot from the
-        // bitmap heap.
-        fWriter.write32(bitmap.getGenerationID());
-        return;
-    }
+
+    // Write a bool to indicate that we did not use an SkBitmapHeap. That feature is deprecated.
+    this->writeBool(false);
 
     SkPixelRef* pixelRef = bitmap.pixelRef();
     if (pixelRef) {
         // see if the pixelref already has an encoded version
         SkAutoDataUnref existingData(pixelRef->refEncodedData());
         if (existingData.get() != nullptr) {
             // Assumes that if the client did not set a serializer, they are
             // happy to get the encoded data.
             if (!fPixelSerializer || fPixelSerializer->useEncodedData(existingData->data(),
                                                                       existingData->size())) {
                 write_encoded_bitmap(this, existingData, bitmap.pixelRefOrigin());
                 return;
             }
         }
 
         // see if the caller wants to manually encode
         SkAutoPixmapUnlock result;
         if (fPixelSerializer && bitmap.requestLock(&result)) {
-            SkASSERT(nullptr == fBitmapHeap);
             SkAutoDataUnref data(fPixelSerializer->encode(result.pixmap()));
             if (data.get() != nullptr) {
                 // if we have to "encode" the bitmap, then we assume there is no
                 // offset to share, since we are effectively creating a new pixelref
                 write_encoded_bitmap(this, data, SkIPoint::Make(0, 0));
                 return;
             }
         }
     }
 
@@ skipping 25 matching lines @@
 SkFactorySet* SkWriteBuffer::setFactoryRecorder(SkFactorySet* rec) {
     SkRefCnt_SafeAssign(fFactorySet, rec);
     return rec;
 }
 
 SkRefCntSet* SkWriteBuffer::setTypefaceRecorder(SkRefCntSet* rec) {
     SkRefCnt_SafeAssign(fTFSet, rec);
     return rec;
 }
 
-void SkWriteBuffer::setBitmapHeap(SkBitmapHeap* bitmapHeap) {
-    SkRefCnt_SafeAssign(fBitmapHeap, bitmapHeap);
-    if (bitmapHeap != nullptr) {
-        SkASSERT(nullptr == fPixelSerializer);
-        fPixelSerializer.reset(nullptr);
-    }
-}
-
 void SkWriteBuffer::setPixelSerializer(SkPixelSerializer* serializer) {
     fPixelSerializer.reset(serializer);
     if (serializer) {
         serializer->ref();
-        SkASSERT(nullptr == fBitmapHeap);
-        SkSafeUnref(fBitmapHeap);
-        fBitmapHeap = nullptr;
     }
 }
 
 void SkWriteBuffer::writeFlattenable(const SkFlattenable* flattenable) {
     /*
      *  The first 32 bits tell us...
      *       0: failure to write the flattenable
      *      >0: index (1-based) into fFactorySet or fFlattenableDict or
      *          the first character of a string
      */
@@ skipping 44 matching lines @@
     // make room for the size of the flattened object
     (void)fWriter.reserve(sizeof(uint32_t));
     // record the current size, so we can subtract after the object writes.
     size_t offset = fWriter.bytesWritten();
     // now flatten the object
     flattenable->flatten(*this);
     size_t objSize = fWriter.bytesWritten() - offset;
     // record the obj's size
     fWriter.overwriteTAt(offset - sizeof(uint32_t), SkToU32(objSize));
 }