SkDecodingImageGenerator now uses SkStreamRewindable

src/core/SkStream.cpp

Index: src/core/SkStream.cpp
diff --git a/src/core/SkStream.cpp b/src/core/SkStream.cpp
index 3350f82fc18c1e26f0e6797145054e9b3f0e2c48..18850db63598581d023bc7d401857e1262b89446 100644
--- a/src/core/SkStream.cpp
+++ b/src/core/SkStream.cpp
@@ -239,6 +239,13 @@ bool SkFILEStream::rewind() {
     return false;
 }
 
+SkData* SkFILEStream::getData() const {
+    if ((NULL != fFILE) && (NULL == fData.get())) {
+        fData.reset(SkData::NewFromFILE(fFILE));
+    }
+    return SkSafeRef(fData.get());
+}
+
 SkStreamAsset* SkFILEStream::duplicate() const {
     if (NULL == fFILE) {
         return new SkMemoryStream();
@@ -342,9 +349,12 @@ void SkMemoryStream::setMemory(const void* src, size_t size, bool copyData) {
     fOffset = 0;
 }
 
+SkData* SkMemoryStream::getData() const {
+    return SkSafeRef(fData);

[scroggo, 2013/12/05 21:07:18]

Could just use SkRef, since fData cannot be NULL.

[hal.canary, 2013/12/05 22:29:29]

Done.  I hadn't seen that template.

+}
+
 SkData* SkMemoryStream::copyToData() const {
-    fData->ref();
-    return fData;
+    return this->getData();
 }
 
 SkData* SkMemoryStream::setData(SkData* data) {