stop calling SkBitmap::flatten

include/core/SkReadBuffer.h

 
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkReadBuffer_DEFINED
 #define SkReadBuffer_DEFINED
@@ skipping 116 matching lines @@
             return SkData::NewEmpty();
         }
         void* buffer = sk_malloc_throw(len);
         this->readByteArray(buffer, len);
         return SkData::NewFromMalloc(buffer, len);
     }
 
     // helpers to get info about arrays and binary data
     virtual uint32_t getArrayCount();
 
-    virtual void readBitmap(SkBitmap* bitmap);
+    /**
+     *  Returns false if the bitmap could not be completely read. In that case, it will be set
+     *  to have width/height, but no pixels.
+     */
+    virtual bool readBitmap(SkBitmap* bitmap);

[scroggo, 2014/05/20 13:27:50]

If SkValidatingBuffer no longer overrides this, does it need to be virtual?

[reed1, 2014/05/20 17:49:58]

Done.

     virtual SkTypeface* readTypeface();
 
     void setBitmapStorage(SkBitmapHeapReader* bitmapStorage) {
         SkRefCnt_SafeAssign(fBitmapStorage, bitmapStorage);
     }
 
     void setTypefaceArray(SkTypeface* array[], int count) {
         fTFArray = array;
         fTFCount = count;
     }
@@ skipping 55 matching lines @@
     SkPicture::InstallPixelRefProc fBitmapDecoder;
 
 #ifdef DEBUG_NON_DETERMINISTIC_ASSERT
     // Debugging counter to keep track of how many bitmaps we
     // have decoded.
     int fDecodedBitmapIndex;
 #endif // DEBUG_NON_DETERMINISTIC_ASSERT
 };
 
 #endif // SkReadBuffer_DEFINED