Revert of Make SkPicture/SkImageGenerator default to SkCodec

include/core/SkPicture.h

Index: include/core/SkPicture.h
diff --git a/include/core/SkPicture.h b/include/core/SkPicture.h
index 7c8c187fd88c83978e8a83366d4153a7c50a7f92..720747e9a3232eeb9b07931b1ad1e939f489e511 100644
--- a/include/core/SkPicture.h
+++ b/include/core/SkPicture.h
@@ -54,19 +54,8 @@
      *  @return A new SkPicture representing the serialized data, or NULL if the stream is
      *          invalid.
      */
-    static SkPicture* CreateFromStream(SkStream*, InstallPixelRefProc proc);
-
-    /**
-     *  Recreate a picture that was serialized into a stream.
-     *
-     *  Any serialized images in the stream will be passed to
-     *  SkImageGenerator::NewFromEncoded.
-     *
-     *  @param SkStream Serialized picture data. Ownership is unchanged by this call.
-     *  @return A new SkPicture representing the serialized data, or NULL if the stream is
-     *          invalid.
-     */
-    static SkPicture* CreateFromStream(SkStream*);
+    static SkPicture* CreateFromStream(SkStream*,
+                                       InstallPixelRefProc proc = &SkImageDecoder::DecodeMemory);
 
     /**
      *  Recreate a picture that was serialized into a buffer. If the creation requires bitmap