SkDecodingImageGenerator now uses SkStreamRewindable

src/core/SkStream.cpp

 
 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #include "SkStream.h"
@@ skipping 221 matching lines @@
         if (sk_frewind(fFILE)) {
             return true;
         }
         // we hit an error
         sk_fclose(fFILE);
         fFILE = NULL;
     }
     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();
     }
 
     if (NULL != fData.get()) {
         return new SkMemoryStream(fData);
     }
 
     if (!fName.isEmpty()) {
@@ skipping 83 matching lines @@
     fData = SkData::NewFromMalloc(src, size);
     fOffset = 0;
 }
 
 void SkMemoryStream::setMemory(const void* src, size_t size, bool copyData) {
     fData->unref();
     fData = newFromParams(src, size, 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) {
     fData->unref();
     if (NULL == data) {
         fData = SkData::NewEmpty();
     } else {
         fData = data;
         fData->ref();
     }
@@ skipping 471 matching lines @@
 
     // If we get here, then our attempt at using mmap failed, so try normal
     // file access.
     SkFILEStream* stream = SkNEW_ARGS(SkFILEStream, (path));
     if (!stream->isValid()) {
         stream->unref();
         stream = NULL;
     }
     return stream;
 }