Make SkPicture/SkImageGenerator default to SkCodec

include/core/SkPicture.h

 /*
  * Copyright 2007 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkPicture_DEFINED
 #define SkPicture_DEFINED
 
@@ skipping 28 matching lines @@
      *  If the installed pixelref has decoded the data into pixels, then the src buffer need not be
      *  copied. If the pixelref defers the actual decode until its lockPixels() is called, then it
      *  must make a copy of the src buffer.
      *  @param src Encoded data.
      *  @param length Size of the encoded data, in bytes.
      *  @param dst SkBitmap to install the pixel ref on.
      *  @param bool Whether or not a pixel ref was successfully installed.
      */
     typedef bool (*InstallPixelRefProc)(const void* src, size_t length, SkBitmap* dst);
 
+    // FIXME: Replace this with an interface that creates an SkImageGenerator.
+    // skbug.com/4883
+    // skbug.com/4290
+    static bool DefaultInstall(const void*, size_t, SkBitmap*);
+
     /**
      *  Recreate a picture that was serialized into a stream.
      *  @param SkStream Serialized picture data. Ownership is unchanged by this call.
      *  @param proc Function pointer for installing pixelrefs on SkBitmaps representing the
      *              encoded bitmap data from the stream.
      *  @return A new SkPicture representing the serialized data, or NULL if the stream is
      *          invalid.
      */
-    static SkPicture* CreateFromStream(SkStream*,
-                                       InstallPixelRefProc proc = &SkImageDecoder::DecodeMemory);
+    static SkPicture* CreateFromStream(SkStream*, InstallPixelRefProc proc = &DefaultInstall);

[reed1, 2016/02/09 15:29:53]

Do we need to expose DefaultInstall() directly? i.e. do clients ever need to
actually call it directly? Could we instead:

SkPicture* CreateFromStream(SkStream*);    // we handle installing our private
default
SkPicture* CreateFromStream(SkStream*, InstallPixelRefProc proc);   // they must
give us a proc

[scroggo, 2016/02/09 16:12:17]

Done.

 
     /**
      *  Recreate a picture that was serialized into a buffer. If the creation requires bitmap
      *  decoding, the decoder must be set on the SkReadBuffer parameter by calling
      *  SkReadBuffer::setBitmapDecoder() before calling SkPicture::CreateFromBuffer().
      *  @param SkReadBuffer Serialized picture data.
      *  @return A new SkPicture representing the serialized data, or NULL if the buffer is
      *          invalid.
      */
     static SkPicture* CreateFromBuffer(SkReadBuffer&);
@@ skipping 129 matching lines @@
     static bool IsValidPictInfo(const SkPictInfo& info);
     static SkPicture* Forwardport(const SkPictInfo&, const SkPictureData*);
 
     SkPictInfo createHeader() const;
     SkPictureData* backport() const;
 
     mutable uint32_t fUniqueID;
 };
 
 #endif