Index: include/core/SkPicture.h |
diff --git a/include/core/SkPicture.h b/include/core/SkPicture.h |
index ddf4551c67701a21cac33537320eb8975460c064..14bf2ddd1dc2e13d9217d7d440dbe164887537d9 100644 |
--- a/include/core/SkPicture.h |
+++ b/include/core/SkPicture.h |
@@ -12,7 +12,7 @@ |
#include "SkBitmap.h" |
#include "SkDrawPictureCallback.h" |
-#include "SkImageDecoder.h" |
+#include "SkRect.h" |
#include "SkRefCnt.h" |
#include "SkTDArray.h" |
@@ -91,7 +91,16 @@ public: |
* invalid. |
*/ |
static SkPicture* CreateFromStream(SkStream*, |
- InstallPixelRefProc proc = &SkImageDecoder::DecodeMemory); |
+ InstallPixelRefProc proc); |
+ |
+ /** |
+ * Recreate a picture that was serialized into a stream. Uses all the default |
+ * image decoders that are compiled into the library. |
+ * @param SkStream Serialized picture data. |
+ * @return A new SkPicture representing the serialized data, or NULL if the stream is |
+ * invalid. |
+ */ |
+ static SkPicture* CreateFromStream(SkStream*); |
/** |
* Recreate a picture that was serialized into a buffer. If the creation requires bitmap |