SkDecodingImageGenerator now uses SkStreamRewindable

src/core/SkData.cpp

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkData.h"
 #include "SkFlattenableBuffers.h"
 #include "SkOSFile.h"
 #include "SkOnce.h"
+#include "SkStream.h"
 
 SkData::SkData(const void* ptr, size_t size, ReleaseProc proc, void* context) {
     fPtr = ptr;
     fSize = size;
     fReleaseProc = proc;
     fReleaseProcContext = context;
 }
 
 SkData::~SkData() {
     if (fReleaseProc) {
@@ skipping 50 matching lines @@
 SkData* SkData::NewWithCopy(const void* data, size_t length) {
     if (0 == length) {
         return SkData::NewEmpty();
     }
 
     void* copy = sk_malloc_throw(length); // balanced in sk_free_releaseproc
     memcpy(copy, data, length);
     return new SkData(copy, length, sk_free_releaseproc, NULL);
 }
 
+SkData* SkData::NewWithCopyFromStream(SkStreamRewindable* stream) {
+    if (!stream->hasLength()) {
+        return NULL;
+    }
+    size_t length = stream->getLength();
+    if (0 == length) {
+        return NULL;
+    }
+    void* buffer = sk_malloc_flags(length, 0);
+    if (NULL == buffer) {
+        return NULL;
+    }
+    if (!stream->rewind()) {
+        sk_free(buffer);
+        return NULL;
+    }
+    SkAssertResult(stream->read(buffer, length) == length);
+    return new SkData(buffer, length, sk_free_releaseproc, NULL);
+}
+
+
 SkData* SkData::NewWithProc(const void* data, size_t length,
                             ReleaseProc proc, void* context) {
     return new SkData(data, length, proc, context);
 }
 
 // assumes fPtr was allocated with sk_fmmap
 static void sk_mmap_releaseproc(const void* addr, size_t length, void*) {
     sk_fmunmap(addr, length);
 }
 
@@ skipping 58 matching lines @@
 SkData* SkData::NewWithCString(const char cstr[]) {
     size_t size;
     if (NULL == cstr) {
         cstr = "";
         size = 1;
     } else {
         size = strlen(cstr) + 1;
     }
     return NewWithCopy(cstr, size);
 }