Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1802)

Unified Diff: include/core/SkPicture.h

Issue 647973006: Remove a SkImageDecoder reference from SkPicture.h (Closed) Base URL: https://skia.googlesource.com/skia.git@separate-image-encoder-02-debug-functionality
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « dm/DMPipeTask.cpp ('k') | include/core/SkWriteBuffer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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
« no previous file with comments | « dm/DMPipeTask.cpp ('k') | include/core/SkWriteBuffer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698