Remove staging SkStream::unref().

src/utils/win/SkIStream.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.
  */
 
 
 #define WIN32_LEAN_AND_MEAN
@@ skipping 85 matching lines @@
 { return E_NOTIMPL; }
 
 HRESULT STDMETHODCALLTYPE SkBaseIStream::Stat(STATSTG* pStatstg
                                             , DWORD grfStatFlag)
 { return E_NOTIMPL; }
 
 
 /**
  * SkIStream
  */
-SkIStream::SkIStream(SkStream* stream, bool unrefOnRelease)
+SkIStream::SkIStream(SkStream* stream, bool deleteOnRelease)
     : SkBaseIStream()
     , fSkStream(stream)
-    , fUnrefOnRelease(unrefOnRelease)
+    , fDeleteOnRelease(deleteOnRelease)
     , fLocation()
 {
     this->fSkStream->rewind();
 }
 
 SkIStream::~SkIStream() {
-    if (this->fSkStream && fUnrefOnRelease) {
-        this->fSkStream->unref();
+    if (this->fSkStream && fDeleteOnRelease) {

[scroggo, 2015/01/22 13:55:36]

It appears fSkStream can never be NULL, so this can just be

if (fDeleteOnRelease) {

+        delete this->fSkStream;
     }
 }
 
 HRESULT SkIStream::CreateFromSkStream(SkStream* stream
-                                    , bool unrefOnRelease
+                                    , bool deleteOnRelease
                                     , IStream ** ppStream)
 {
     if (NULL == stream) {
         return E_INVALIDARG;
     }
-    *ppStream = new SkIStream(stream, unrefOnRelease);
+    *ppStream = new SkIStream(stream, deleteOnRelease);
     return S_OK;
 }
 
 // ISequentialStream Interface
 HRESULT STDMETHODCALLTYPE SkIStream::Read(void* pv, ULONG cb, ULONG* pcbRead) {
     *pcbRead = static_cast<ULONG>(this->fSkStream->read(pv, cb));
     this->fLocation.QuadPart += *pcbRead;
     return (*pcbRead == cb) ? S_OK : S_FALSE;
 }
 
@@ skipping 129 matching lines @@
     if (0 == (grfStatFlag & STATFLAG_NONAME)) {
         return STG_E_INVALIDFLAG;
     }
     pStatstg->pwcsName = NULL;
     pStatstg->cbSize.QuadPart = 0;
     pStatstg->clsid = CLSID_NULL;
     pStatstg->type = STGTY_STREAM;
     pStatstg->grfMode = STGM_WRITE;
     return S_OK;
 }