Deserialize pictures with custom image-deserializer

src/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 149 matching lines @@
         }
         void* buffer = sk_malloc_throw(len);
         this->readByteArray(buffer, len);
         return SkData::MakeFromMalloc(buffer, len);
     }
 
     // helpers to get info about arrays and binary data
     virtual uint32_t getArrayCount();
 
     /**
-     *  Returns false if the bitmap could not be completely read. In that case, it will be set
+     *  Returns false if the image could not be completely read. In that case, it will be set
      *  to have width/height, but no pixels.
      */
-    bool readBitmap(SkBitmap* bitmap);
-
-    SkImage* readImage();
+    sk_sp<SkImage> readBitmapAsImage();
+    sk_sp<SkImage> readImage();
 
     virtual SkTypeface* readTypeface();
 
     void setTypefaceArray(SkTypeface* array[], int count) {
         fTFArray = array;
         fTFCount = count;
     }
 
     /**
      *  Call this with a pre-loaded array of Factories, in the same order as
@@ skipping 11 matching lines @@
      *  If the global registry already has a default factory for the flattenable,
      *  this will override that factory.  If a custom factory has already been
      *  set for the flattenable, this will override that factory.
      *
      *  Custom factories can be removed by calling setCustomFactory("...", nullptr).
      */
     void setCustomFactory(const SkString& name, SkFlattenable::Factory factory) {
         fCustomFactory.set(name, factory);
     }
 
-    /**
-     *  Provide a function to decode an SkBitmap from encoded data. Only used if the writer
-     *  encoded the SkBitmap. If the proper decoder cannot be used, a red bitmap with the
-     *  appropriate size will be used.
-     */
-    void setBitmapDecoder(SkPicture::InstallPixelRefProc bitmapDecoder) {
-        fBitmapDecoder = bitmapDecoder;
-    }
+    // If nullptr is passed, then the default deserializer will be used
+    // which calls SkImage::MakeFromEncoded()
+    void setImageDeserializer(SkImageDeserializer* factory);
 
     // Default impelementations don't check anything.
     virtual bool validate(bool isValid) { return isValid; }
     virtual bool isValid() const { return true; }
     virtual bool validateAvailable(size_t size) { return true; }
     bool validateIndex(int index, int count) {
         return this->validate(index >= 0 && index < count);
     }
 
 protected:
     /**
      *  Allows subclass to check if we are using factories for expansion
      *  of flattenables.
      */
     int factoryCount() { return fFactoryCount; }
 
-
     /**
      *  Checks if a custom factory has been set for a given flattenable.
      *  Returns the custom factory if it exists, or nullptr otherwise.
      */
     SkFlattenable::Factory getCustomFactory(const SkString& name) {
         SkFlattenable::Factory* factoryPtr = fCustomFactory.find(name);
         return factoryPtr ? *factoryPtr : nullptr;
     }
 
     SkReader32 fReader;
@@ skipping 11 matching lines @@
 
     SkTypeface** fTFArray;
     int        fTFCount;
 
     SkFlattenable::Factory* fFactoryArray;
     int                     fFactoryCount;
 
     // Only used if we do not have an fFactoryArray.
     SkTHashMap<SkString, SkFlattenable::Factory> fCustomFactory;
 
-    SkPicture::InstallPixelRefProc fBitmapDecoder;
+    // We do not own this ptr, we just use it (guaranteed to never be null)
+    SkImageDeserializer* fImageDeserializer;
 
 #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