Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(335)

Unified Diff: src/utils/win/SkIStream.cpp

Issue 861413002: Remove staging SkStream::unref(). (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Fix stragglers. Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« include/utils/win/SkIStream.h ('K') | « src/utils/win/SkDWriteFontFileStream.cpp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/utils/win/SkIStream.cpp
diff --git a/src/utils/win/SkIStream.cpp b/src/utils/win/SkIStream.cpp
index 6274e717a2065dd7e7e87102a355c632982ab9f8..2e9510cf9543705288f9982de04b2d1a5b09eef1 100644
--- a/src/utils/win/SkIStream.cpp
+++ b/src/utils/win/SkIStream.cpp
@@ -103,29 +103,29 @@ HRESULT STDMETHODCALLTYPE SkBaseIStream::Stat(STATSTG* pStatstg
/**
* 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 ca
+ 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;
}
« include/utils/win/SkIStream.h ('K') | « src/utils/win/SkDWriteFontFileStream.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698