SkDecodingImageGenerator now uses SkStreamRewindable

include/core/SkData.h

 
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 
 #ifndef SkData_DEFINED
 #define SkData_DEFINED
 
 #include "SkRefCnt.h"
 
 struct SkFILE;
+class SkStreamRewindable;
 
 /**
  *  SkData holds an immutable data buffer. Not only is the data immutable,
  *  but the actual ptr that is returned (by data() or bytes()) is guaranteed
  *  to always be the same for the life of this instance.
  */
 class SK_API SkData : public SkRefCnt {
 public:
     SK_DECLARE_INST_COUNT(SkData)
 
@@ skipping 36 matching lines @@
      *  of scope, allowing for custom allocation/freeing of the data.
      */
     typedef void (*ReleaseProc)(const void* ptr, size_t length, void* context);
 
     /**
      *  Create a new dataref by copying the specified data
      */
     static SkData* NewWithCopy(const void* data, size_t length);
 
     /**
+     *  Create a new dataref by copying the data out of the stream.
+     *  The stream's position will be changed after this call.  Only
+     *  succeeds if stream->hasLength(), getLength() is non-zero, and
+     *  sk_malloc) succeeds.  Returns NULL on failure.
+     *
+     *  You probably want to try stream->getData() first.

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

Can you specify why getData is better?

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

Done.

+     */
+    static SkData* NewWithCopyFromStream(SkStreamRewindable* stream);
+
+    /**
      *  Create a new dataref by copying the specified c-string
      *  (a null-terminated array of bytes). The returned SkData will have size()
      *  equal to strlen(cstr) + 1. If cstr is NULL, it will be treated the same
      *  as "".
      */
     static SkData* NewWithCString(const char cstr[]);
 
     /**
      *  Create a new dataref, taking the data ptr as is, and using the
      *  releaseproc to free it. The proc may be NULL.
@@ skipping 56 matching lines @@
     // Called the first time someone calls NewEmpty to initialize the singleton.
     static void NewEmptyImpl(SkData**);
 
     typedef SkRefCnt INHERITED;
 };
 
 /** Typedef of SkAutoTUnref<SkData> for automatically unref-ing a SkData. */
 typedef SkAutoTUnref<SkData> SkAutoDataUnref;
 
 #endif