aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar bungeman <bungeman@google.com>2015-01-22 07:33:51 -0800
committerGravatar Commit bot <commit-bot@chromium.org>2015-01-22 07:33:51 -0800
commit44af7ba4bc571110f02f31dd71a8fd4dc7e6bfd2 (patch)
tree2d473fefc30b216e048ef88e4ae56b716387f48a
parent2fdeda04988867625bb9bc2f7f6037406a0a98ec (diff)
Fix SkIStream nits.
Fix comment, constness of one field, and delete already checks for NULL. TBR=reed@google.com Trivial change to debatably public api. Review URL: https://codereview.chromium.org/868643003
-rw-r--r--include/utils/win/SkIStream.h4
-rw-r--r--src/utils/win/SkIStream.cpp2
2 files changed, 3 insertions, 3 deletions
diff --git a/include/utils/win/SkIStream.h b/include/utils/win/SkIStream.h
index e2c2b966fb..9e04b7e472 100644
--- a/include/utils/win/SkIStream.h
+++ b/include/utils/win/SkIStream.h
@@ -75,12 +75,12 @@ public:
};
/**
- * A minimal read-only IStream implementation which wraps an SkIStream.
+ * A minimal read-only IStream implementation which wraps an SkStream.
*/
class SkIStream : public SkBaseIStream {
private:
SkStream *fSkStream;
- bool fDeleteOnRelease;
+ const bool fDeleteOnRelease;
ULARGE_INTEGER fLocation;
SkIStream(SkStream* stream, bool fDeleteOnRelease);
diff --git a/src/utils/win/SkIStream.cpp b/src/utils/win/SkIStream.cpp
index 2e9510cf95..dc9d1636d7 100644
--- a/src/utils/win/SkIStream.cpp
+++ b/src/utils/win/SkIStream.cpp
@@ -113,7 +113,7 @@ SkIStream::SkIStream(SkStream* stream, bool deleteOnRelease)
}
SkIStream::~SkIStream() {
- if (this->fSkStream && fDeleteOnRelease) {
+ if (fDeleteOnRelease) {
delete this->fSkStream;
}
}