SkDecodingImageGenerator now uses SkStreamRewindable

include/core/SkStream.h

 /*
  * 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.
  */
 
 #ifndef SkStream_DEFINED
 #define SkStream_DEFINED
 
@@ skipping 108 matching lines @@
     /** Duplicates this stream. If this cannot be done, returns NULL.
      *  The returned stream will be positioned the same as this stream.
      */
     virtual SkStreamSeekable* fork() const { return NULL; }
 
 //SkStreamAsset
     /** Returns true if this stream can report it's total length. */
     virtual bool hasLength() const { return false; }
     /** Returns the total length of the stream. If this cannot be done, returns 0. */
     virtual size_t getLength() const { return 0; }
+    /** Returns a ref to the data, if it can be created
+       inexpensively. If non-null is returned, the caller is
+       responsible for calling unref() on the data when it is
+       finished. */
+    virtual SkData* getData() const { return NULL; }

[bungeman-skia, 2013/12/05 21:03:44]

I would put this down with SkStreamMemory, replacing the TODO. Generally, these
are put into the section where they start to be required. Putting this in the
SkStreamMemory section does not preclude SkStreamAssets (or any other SkStream
type for that matter) from implementing it (to work all or some of the time).

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

Done.

 
 //SkStreamMemory
     /** Returns the starting address for the data. If this cannot be done, returns NULL. */
     //TODO: replace with virtual const SkData* getData()
     virtual const void* getMemoryBase() { return NULL; }
 
 private:
     typedef SkRefCnt INHERITED;
 };
 
@@ skipping 25 matching lines @@
     virtual bool hasLength() const SK_OVERRIDE { return true; }
     virtual size_t getLength() const SK_OVERRIDE = 0;
 };
 
 /** SkStreamMemory is a SkStreamAsset for which getMemoryBase is required. */
 class SK_API SkStreamMemory : public SkStreamAsset {
 public:
     virtual SkStreamMemory* duplicate() const SK_OVERRIDE = 0;
     virtual SkStreamMemory* fork() const SK_OVERRIDE = 0;
 
     virtual const void* getMemoryBase() SK_OVERRIDE = 0;

[bungeman-skia, 2013/12/05 21:03:44]

virtual SkData* getData() const SK_OVERRIDE = 0;

should go here, even if it must be commented out at the moment (which I don't
think it does). This would document that an SkStreamMemory is expected to always
be able to produce an SkData here, and forces implementations to consider the
implementation of this method.

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

Done.

 };
 
 class SK_API SkWStream : SkNoncopyable {
 public:
     SK_DECLARE_INST_COUNT_ROOT(SkWStream)
 
     virtual ~SkWStream();
 
     /** Called to write bytes to a SkWStream. Returns true on success
         @param buffer the address of at least size bytes to be written to the stream
@@ skipping 77 matching lines @@
     virtual bool rewind() SK_OVERRIDE;
     virtual SkStreamAsset* duplicate() const SK_OVERRIDE;
 
     virtual size_t getPosition() const SK_OVERRIDE;
     virtual bool seek(size_t position) SK_OVERRIDE;
     virtual bool move(long offset) SK_OVERRIDE;
     virtual SkStreamAsset* fork() const SK_OVERRIDE;
 
     virtual size_t getLength() const SK_OVERRIDE;
 
+    virtual SkData* getData() const SK_OVERRIDE;
     virtual const void* getMemoryBase() SK_OVERRIDE;
 
 private:
     SkFILE*     fFILE;
     SkString    fName;
     Ownership   fOwnership;
     // fData is lazilly initialized when needed.
     mutable SkAutoTUnref<SkData> fData;
 
     typedef SkStreamAsset INHERITED;
@@ skipping 52 matching lines @@
     virtual bool rewind() SK_OVERRIDE;
     virtual SkMemoryStream* duplicate() const SK_OVERRIDE;
 
     virtual size_t getPosition() const SK_OVERRIDE;
     virtual bool seek(size_t position) SK_OVERRIDE;
     virtual bool move(long offset) SK_OVERRIDE;
     virtual SkMemoryStream* fork() const SK_OVERRIDE;
 
     virtual size_t getLength() const SK_OVERRIDE;
 
+    virtual SkData* getData() const SK_OVERRIDE;
     virtual const void* getMemoryBase() SK_OVERRIDE;
 
 private:
     SkData* fData;
     size_t  fOffset;
 
     typedef SkStreamMemory INHERITED;
 };
 
 /////////////////////////////////////////////////////////////////////////////////////////////
@@ skipping 90 matching lines @@
     virtual void newline() SK_OVERRIDE;
 
 private:
     typedef SkWStream INHERITED;
 };
 
 // for now
 typedef SkFILEStream SkURLStream;
 
 #endif