Index: include/core/SkStream.h |
=================================================================== |
--- include/core/SkStream.h (revision 10125) |
+++ include/core/SkStream.h (working copy) |
@@ -280,7 +280,7 @@ |
virtual size_t getLength() const SK_OVERRIDE; |
- const void* getMemoryBase() SK_OVERRIDE; |
+ virtual const void* getMemoryBase() SK_OVERRIDE; |
private: |
SkFILE* fFILE; |
@@ -423,7 +423,10 @@ |
*/ |
SkData* copyToData() const; |
- // reset the stream to its original state |
+ /** Reset, returning a reader stream with the current content. */ |
+ SkStreamAsset* detatchAsStream(); |
+ |
+ /** Reset the stream to its original, empty, state. */ |
void reset(); |
void padToAlign4(); |
private: |
@@ -435,6 +438,10 @@ |
void invalidateCopy(); |
+ // For access to the Block type. |
+ friend class SkBlockMemoryStream; |
+ friend class SkBlockMemoryRefCnt; |
+ |
typedef SkWStream INHERITED; |
}; |