Fixes for piping bitmaps with encoded data.

src/core/SkOrderedReadBuffer.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 SkOrderedReadBuffer_DEFINED
 #define SkOrderedReadBuffer_DEFINED
@@ skipping 55 matching lines @@
     // helpers to get info about arrays and binary data
     virtual uint32_t getArrayCount() SK_OVERRIDE;
 
     virtual void readBitmap(SkBitmap* bitmap) SK_OVERRIDE;
     virtual SkTypeface* readTypeface() SK_OVERRIDE;
 
     void setBitmapStorage(SkBitmapHeapReader* bitmapStorage) {
         SkRefCnt_SafeAssign(fBitmapStorage, bitmapStorage);
     }
 
+    /**
+     *  Return a pointer to the bitmap storage. Does not affect its ref count.
+     */
+    SkBitmapHeapReader* getBitmapStorage() {
+        return fBitmapStorage;
+    }
+
     void setTypefaceArray(SkTypeface* array[], int count) {
         fTFArray = array;
         fTFCount = count;
     }
 
     /**
      *  Call this with a pre-loaded array of Factories, in the same order as
      *  were created/written by the writer. SkPicture uses this.
      */
     void setFactoryPlayback(SkFlattenable::Factory array[], int count) {
@@ skipping 33 matching lines @@
     SkTDArray<SkFlattenable::Factory>* fFactoryTDArray;
     SkFlattenable::Factory* fFactoryArray;
     int                     fFactoryCount;
 
     SkPicture::InstallPixelRefProc fBitmapDecoder;
 
     typedef SkFlattenableReadBuffer INHERITED;
 };
 
 #endif // SkOrderedReadBuffer_DEFINED