Make SkStream *not* ref counted.

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
 
+#include "SkInstCnt.h"
 #include "SkRefCnt.h"
 #include "SkScalar.h"
 
 class SkData;
 
 class SkStream;
 class SkStreamRewindable;
 class SkStreamSeekable;
 class SkStreamAsset;
 class SkStreamMemory;
 
 /**
  *  SkStream -- abstraction for a source of bytes. Subclasses can be backed by
  *  memory, or a file, or something else.
  *
  *  NOTE:
  *
  *  Classic "streams" APIs are sort of async, in that on a request for N
  *  bytes, they may return fewer than N bytes on a given call, in which case
  *  the caller can "try again" to get more bytes, eventually (modulo an error)
  *  receiving their total N bytes.
  *
  *  Skia streams behave differently. They are effectively synchronous, and will
  *  always return all N bytes of the request if possible. If they return fewer
  *  (the read() call returns the number of bytes read) then that means there is
  *  no more data (at EOF or hit an error). The caller should *not* call again
  *  in hopes of fulfilling more of the request.
  */
-class SK_API SkStream : public SkRefCnt { //TODO: remove SkRefCnt
+class SK_API SkStream : public SkNoncopyable {
 public:
+    virtual ~SkStream() {}
     /**
      *  Attempts to open the specified file, and return a stream to it (using
-     *  mmap if available). On success, the caller must call unref() on the
-     *  returned object. On failure, returns NULL.
+     *  mmap if available). On success, the caller is responsible for deleting.
+     *  On failure, returns NULL.
      */
     static SkStreamAsset* NewFromFile(const char path[]);
 
     SK_DECLARE_INST_COUNT(SkStream)

[bungeman-skia, 2015/01/15 22:44:55]

The entire point of this is to instance count ref countable objects, so we
should just remove it (and the include above).

[scroggo, 2015/01/16 19:13:37]

Oh, right, of course.

 
     /** Reads or skips size number of bytes.
      *  If buffer == NULL, skip size bytes, return how many were skipped.
      *  If buffer != NULL, copy size bytes into buffer, return how many were copied.
      *  @param buffer when NULL skip size bytes, otherwise copy size bytes into buffer
      *  @param size the number of bytes to skip or copy
      *  @return the number of bytes actually read.
      */
     virtual size_t read(void* buffer, size_t size) = 0;
 
@@ skipping 59 matching lines @@
 //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; }
 
 //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;
 };
 
 /** SkStreamRewindable is a SkStream for which rewind and duplicate are required. */
 class SK_API SkStreamRewindable : public SkStream {
 public:
     bool rewind() SK_OVERRIDE = 0;
     SkStreamRewindable* duplicate() const SK_OVERRIDE = 0;
 };
 
 /** SkStreamSeekable is a SkStreamRewindable for which position, seek, move, and fork are required. */
@@ skipping 299 matching lines @@
 
 private:
     size_t fBytesWritten;
     typedef SkWStream INHERITED;
 };
 
 // for now
 typedef SkFILEStream SkURLStream;
 
 #endif