Revert "Remove SkRefPtr" - r7021
samplecode/ still needs to be updated.
Review URL: https://codereview.appspot.com/7032048
git-svn-id: http://skia.googlecode.com/svn/trunk@7022 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/src/pdf/SkPDFStream.cpp b/src/pdf/SkPDFStream.cpp
index 38e874e..d113a0b 100644
--- a/src/pdf/SkPDFStream.cpp
+++ b/src/pdf/SkPDFStream.cpp
@@ -21,20 +21,19 @@
SkPDFStream::SkPDFStream(SkStream* stream)
: fState(kUnused_State),
fData(stream) {
- SkSafeRef(stream);
}
SkPDFStream::SkPDFStream(SkData* data) : fState(kUnused_State) {
SkMemoryStream* stream = new SkMemoryStream;
stream->setData(data);
- fData.reset(stream); // Transfer ownership.
+ fData = stream;
+ fData->unref(); // SkRefPtr and new both took a reference.
}
SkPDFStream::SkPDFStream(const SkPDFStream& pdfStream)
: SkPDFDict(),
fState(kUnused_State),
- fData(pdfStream.fData.get()) {
- fData.get()->ref();
+ fData(pdfStream.fData) {
bool removeLength = true;
// Don't uncompress an already compressed stream, but we could.
if (pdfStream.fState == kCompressed_State) {
@@ -85,8 +84,7 @@
SkPDFStream::SkPDFStream() : fState(kUnused_State) {}
void SkPDFStream::setData(SkStream* stream) {
- fData.reset(stream);
- SkSafeRef(stream);
+ fData = stream;
}
bool SkPDFStream::populate(SkPDFCatalog* catalog) {
@@ -98,7 +96,8 @@
if (compressedData.getOffset() < fData->getLength()) {
SkMemoryStream* stream = new SkMemoryStream;
stream->setData(compressedData.copyToData())->unref();
- fData.reset(stream); // Transfer ownership.
+ fData = stream;
+ fData->unref(); // SkRefPtr and new both took a reference.
insertName("Filter", "FlateDecode");
}
fState = kCompressed_State;
@@ -109,7 +108,8 @@
} else if (fState == kNoCompression_State && !skip_compression(catalog) &&
SkFlate::HaveFlate()) {
if (!fSubstitute.get()) {
- fSubstitute.reset(new SkPDFStream(*this));
+ fSubstitute = new SkPDFStream(*this);
+ fSubstitute->unref(); // SkRefPtr and new both took a reference.
catalog->setSubstitute(this, fSubstitute.get());
}
return false;