Remove SkRefPtr
Review URL: https://codereview.appspot.com/7030059
git-svn-id: http://skia.googlecode.com/svn/trunk@7021 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/include/core/SkRefCnt.h b/include/core/SkRefCnt.h
index 21ed0ef..17d77de 100644
--- a/include/core/SkRefCnt.h
+++ b/include/core/SkRefCnt.h
@@ -229,37 +229,5 @@
SkRefCnt* fObj;
};
-/** Wrapper class for SkRefCnt pointers. This manages ref/unref of a pointer to
- a SkRefCnt (or subclass) object.
- */
-template <typename T> class SkRefPtr {
-public:
- SkRefPtr() : fObj(NULL) {}
- SkRefPtr(T* obj) : fObj(obj) { SkSafeRef(fObj); }
- SkRefPtr(const SkRefPtr& o) : fObj(o.fObj) { SkSafeRef(fObj); }
- ~SkRefPtr() { SkSafeUnref(fObj); }
-
- SkRefPtr& operator=(const SkRefPtr& rp) {
- SkRefCnt_SafeAssign(fObj, rp.fObj);
- return *this;
- }
- SkRefPtr& operator=(T* obj) {
- SkRefCnt_SafeAssign(fObj, obj);
- return *this;
- }
-
- T* get() const { return fObj; }
- T& operator*() const { return *fObj; }
- T* operator->() const { return fObj; }
-
- typedef T* SkRefPtr::*unspecified_bool_type;
- operator unspecified_bool_type() const {
- return fObj ? &SkRefPtr::fObj : NULL;
- }
-
-private:
- T* fObj;
-};
-
#endif
diff --git a/src/pdf/SkPDFDevice.cpp b/src/pdf/SkPDFDevice.cpp
index 0de011c..7f189aa 100644
--- a/src/pdf/SkPDFDevice.cpp
+++ b/src/pdf/SkPDFDevice.cpp
@@ -1006,8 +1006,7 @@
fResourceDict = SkNEW(SkPDFDict);
if (fGraphicStateResources.count()) {
- SkRefPtr<SkPDFDict> extGState = new SkPDFDict();
- extGState->unref(); // SkRefPtr and new both took a reference.
+ SkAutoTUnref<SkPDFDict> extGState(new SkPDFDict());
for (int i = 0; i < fGraphicStateResources.count(); i++) {
SkString nameString("G");
nameString.appendS32(i);
@@ -1019,8 +1018,7 @@
}
if (fXObjectResources.count()) {
- SkRefPtr<SkPDFDict> xObjects = new SkPDFDict();
- xObjects->unref(); // SkRefPtr and new both took a reference.
+ SkAutoTUnref<SkPDFDict> xObjects(new SkPDFDict());
for (int i = 0; i < fXObjectResources.count(); i++) {
SkString nameString("X");
nameString.appendS32(i);
@@ -1032,8 +1030,7 @@
}
if (fFontResources.count()) {
- SkRefPtr<SkPDFDict> fonts = new SkPDFDict();
- fonts->unref(); // SkRefPtr and new both took a reference.
+ SkAutoTUnref<SkPDFDict> fonts(new SkPDFDict());
for (int i = 0; i < fFontResources.count(); i++) {
SkString nameString("F");
nameString.appendS32(i);
@@ -1044,8 +1041,7 @@
}
if (fShaderResources.count()) {
- SkRefPtr<SkPDFDict> patterns = new SkPDFDict();
- patterns->unref(); // SkRefPtr and new both took a reference.
+ SkAutoTUnref<SkPDFDict> patterns(new SkPDFDict());
for (int i = 0; i < fShaderResources.count(); i++) {
SkString nameString("P");
nameString.appendS32(i);
@@ -1058,8 +1054,7 @@
// For compatibility, add all proc sets (only used for output to PS
// devices).
const char procs[][7] = {"PDF", "Text", "ImageB", "ImageC", "ImageI"};
- SkRefPtr<SkPDFArray> procSets = new SkPDFArray();
- procSets->unref(); // SkRefPtr and new both took a reference.
+ SkAutoTUnref<SkPDFArray> procSets(new SkPDFArray());
procSets->reserve(SK_ARRAY_COUNT(procs));
for (size_t i = 0; i < SK_ARRAY_COUNT(procs); i++)
procSets->appendName(procs[i]);
@@ -1266,9 +1261,8 @@
SkPaint stockPaint;
this->drawPaint(draw, stockPaint);
SkAutoTUnref<SkPDFFormXObject> maskFormXObject(createFormXObjectFromDevice());
- SkRefPtr<SkPDFGraphicState> sMaskGS =
- SkPDFGraphicState::GetSMaskGraphicState(maskFormXObject, invertClip);
- sMaskGS->unref(); // SkRefPtr and getSMaskGraphicState both took a ref.
+ SkAutoTUnref<SkPDFGraphicState> sMaskGS(
+ SkPDFGraphicState::GetSMaskGraphicState(maskFormXObject, invertClip));
// Draw the xobject with the clip as a mask.
ScopedContentEntry content(this, &fExistingClipStack, fExistingClipRegion,
@@ -1283,8 +1277,7 @@
fXObjectResources.push(xobject);
xobject->ref();
- sMaskGS = SkPDFGraphicState::GetNoSMaskGraphicState();
- sMaskGS->unref(); // SkRefPtr and getSMaskGraphicState both took a ref.
+ sMaskGS.reset(SkPDFGraphicState::GetNoSMaskGraphicState());
SkPDFUtils::ApplyGraphicState(addGraphicStateResource(sMaskGS.get()),
&content.entry()->fContent);
}
@@ -1421,27 +1414,25 @@
return;
}
- SkRefPtr<SkPDFGraphicState> sMaskGS;
+ SkAutoTUnref<SkPDFGraphicState> sMaskGS;
if (xfermode == SkXfermode::kSrcIn_Mode ||
xfermode == SkXfermode::kSrcOut_Mode) {
- sMaskGS = SkPDFGraphicState::GetSMaskGraphicState(
- dst, xfermode == SkXfermode::kSrcOut_Mode);
+ sMaskGS.reset(SkPDFGraphicState::GetSMaskGraphicState(
+ dst, xfermode == SkXfermode::kSrcOut_Mode));
fXObjectResources.push(srcFormXObject.get());
srcFormXObject.get()->ref();
} else {
- sMaskGS = SkPDFGraphicState::GetSMaskGraphicState(
- srcFormXObject.get(), xfermode == SkXfermode::kDstOut_Mode);
+ sMaskGS.reset(SkPDFGraphicState::GetSMaskGraphicState(
+ srcFormXObject.get(), xfermode == SkXfermode::kDstOut_Mode));
// dst already added to fXObjectResources in drawFormXObjectWithClip.
}
- sMaskGS->unref(); // SkRefPtr and getSMaskGraphicState both took a ref.
SkPDFUtils::ApplyGraphicState(addGraphicStateResource(sMaskGS.get()),
&inClipContentEntry.entry()->fContent);
SkPDFUtils::DrawFormXObject(fXObjectResources.count() - 1,
&inClipContentEntry.entry()->fContent);
- sMaskGS = SkPDFGraphicState::GetNoSMaskGraphicState();
- sMaskGS->unref(); // SkRefPtr and getSMaskGraphicState both took a ref.
+ sMaskGS.reset(SkPDFGraphicState::GetNoSMaskGraphicState());
SkPDFUtils::ApplyGraphicState(addGraphicStateResource(sMaskGS.get()),
&inClipContentEntry.entry()->fContent);
}
@@ -1474,7 +1465,7 @@
entry->fShaderIndex = -1;
// PDF treats a shader as a color, so we only set one or the other.
- SkRefPtr<SkPDFObject> pdfShader;
+ SkAutoTUnref<SkPDFObject> pdfShader;
const SkShader* shader = paint.getShader();
SkColor color = paint.getColor();
if (shader) {
@@ -1494,8 +1485,7 @@
fInitialTransform.mapRect(&boundsTemp);
boundsTemp.roundOut(&bounds);
- pdfShader = SkPDFShader::GetPDFShader(*shader, transform, bounds);
- SkSafeUnref(pdfShader.get()); // getShader and SkRefPtr both took a ref
+ pdfShader.reset(SkPDFShader::GetPDFShader(*shader, transform, bounds));
if (pdfShader.get()) {
// pdfShader has been canonicalized so we can directly compare
@@ -1504,7 +1494,7 @@
if (resourceIndex < 0) {
resourceIndex = fShaderResources.count();
fShaderResources.push(pdfShader.get());
- pdfShader->ref();
+ pdfShader.get()->ref();
}
entry->fShaderIndex = resourceIndex;
} else {
@@ -1523,15 +1513,16 @@
}
}
- SkRefPtr<SkPDFGraphicState> newGraphicState;
+ SkAutoTUnref<SkPDFGraphicState> newGraphicState;
if (color == paint.getColor()) {
- newGraphicState = SkPDFGraphicState::GetGraphicStateForPaint(paint);
+ newGraphicState.reset(
+ SkPDFGraphicState::GetGraphicStateForPaint(paint));
} else {
SkPaint newPaint = paint;
newPaint.setColor(color);
- newGraphicState = SkPDFGraphicState::GetGraphicStateForPaint(newPaint);
+ newGraphicState.reset(
+ SkPDFGraphicState::GetGraphicStateForPaint(newPaint));
}
- newGraphicState->unref(); // getGraphicState and SkRefPtr both took a ref.
int resourceIndex = addGraphicStateResource(newGraphicState.get());
entry->fGraphicStateIndex = resourceIndex;
@@ -1572,13 +1563,12 @@
}
int SkPDFDevice::getFontResourceIndex(SkTypeface* typeface, uint16_t glyphID) {
- SkRefPtr<SkPDFFont> newFont = SkPDFFont::GetFontResource(typeface, glyphID);
- newFont->unref(); // getFontResource and SkRefPtr both took a ref.
+ SkAutoTUnref<SkPDFFont> newFont(SkPDFFont::GetFontResource(typeface, glyphID));
int resourceIndex = fFontResources.find(newFont.get());
if (resourceIndex < 0) {
resourceIndex = fFontResources.count();
fFontResources.push(newFont.get());
- newFont->ref();
+ newFont.get()->ref();
}
return resourceIndex;
}
diff --git a/src/pdf/SkPDFDocument.cpp b/src/pdf/SkPDFDocument.cpp
index 7e064ee..c7266d8 100644
--- a/src/pdf/SkPDFDocument.cpp
+++ b/src/pdf/SkPDFDocument.cpp
@@ -98,13 +98,11 @@
fDocCatalog->insert("Pages", new SkPDFObjRef(pageTreeRoot))->unref();
/* TODO(vandebo): output intent
- SkRefPtr<SkPDFDict> outputIntent = new SkPDFDict("OutputIntent");
- outputIntent->unref(); // SkRefPtr and new both took a reference.
+ SkAutoTUnref<SkPDFDict> outputIntent = new SkPDFDict("OutputIntent");
outputIntent->insert("S", new SkPDFName("GTS_PDFA1"))->unref();
outputIntent->insert("OutputConditionIdentifier",
new SkPDFString("sRGB"))->unref();
- SkRefPtr<SkPDFArray> intentArray = new SkPDFArray;
- intentArray->unref(); // SkRefPtr and new both took a reference.
+ SkAutoTUnref<SkPDFArray> intentArray = new SkPDFArray;
intentArray->append(outputIntent.get());
fDocCatalog->insert("OutputIntent", intentArray.get());
*/
diff --git a/src/pdf/SkPDFFont.cpp b/src/pdf/SkPDFFont.cpp
index 9a8f136..f2b3f53 100644
--- a/src/pdf/SkPDFFont.cpp
+++ b/src/pdf/SkPDFFont.cpp
@@ -155,13 +155,12 @@
// if the data was NUL terminated so that we can use strstr() to search it.
// Make as few copies as possible given these constraints.
SkDynamicMemoryWStream dynamicStream;
- SkRefPtr<SkMemoryStream> staticStream;
+ SkAutoTUnref<SkMemoryStream> staticStream;
SkData* data = NULL;
const uint8_t* src;
size_t srcLen;
if ((srcLen = srcStream->getLength()) > 0) {
- staticStream = new SkMemoryStream(srcLen + 1);
- staticStream->unref(); // new and SkRefPtr both took a ref.
+ staticStream.reset(new SkMemoryStream(srcLen + 1));
src = (const uint8_t*)staticStream->getMemoryBase();
if (srcStream->getMemoryBase() != NULL) {
memcpy((void *)src, srcStream->getMemoryBase(), srcLen);
@@ -318,8 +317,7 @@
break;
}
case SkAdvancedTypefaceMetrics::WidthRange::kRange: {
- SkRefPtr<SkPDFArray> advanceArray = new SkPDFArray();
- advanceArray->unref(); // SkRefPtr and new both took a ref.
+ SkAutoTUnref<SkPDFArray> advanceArray(new SkPDFArray());
for (int j = 0; j < advanceInfo->fAdvance.count(); j++)
appendAdvance(advanceInfo->fAdvance[j], emSize,
advanceArray.get());
@@ -530,8 +528,7 @@
append_tounicode_header(&cmap);
append_cmap_sections(glyphToUnicode, subset, &cmap);
append_cmap_footer(&cmap);
- SkRefPtr<SkMemoryStream> cmapStream = new SkMemoryStream();
- cmapStream->unref(); // SkRefPtr and new took a reference.
+ SkAutoTUnref<SkMemoryStream> cmapStream(new SkMemoryStream());
cmapStream->setData(cmap.copyToData())->unref();
return new SkPDFStream(cmapStream.get());
}
@@ -547,9 +544,8 @@
const SkTypeface* typeface,
const SkTDArray<uint32_t>& subset,
SkPDFStream** fontStream) {
- SkRefPtr<SkStream> fontData =
- SkFontHost::OpenStream(SkTypeface::UniqueID(typeface));
- fontData->unref(); // SkRefPtr and OpenStream both took a ref.
+ SkAutoTUnref<SkStream> fontData(
+ SkFontHost::OpenStream(SkTypeface::UniqueID(typeface)));
int fontSize = fontData->getLength();
@@ -766,11 +762,12 @@
return CanonicalFonts()[relatedFontIndex].fFont;
}
- SkRefPtr<SkAdvancedTypefaceMetrics> fontMetrics;
+ SkAutoTUnref<SkAdvancedTypefaceMetrics> fontMetrics;
SkPDFDict* relatedFontDescriptor = NULL;
if (relatedFontIndex >= 0) {
SkPDFFont* relatedFont = CanonicalFonts()[relatedFontIndex].fFont;
- fontMetrics = relatedFont->fontInfo();
+ fontMetrics.reset(relatedFont->fontInfo());
+ SkSafeRef(fontMetrics.get());
relatedFontDescriptor = relatedFont->getFontDescriptor();
// This only is to catch callers who pass invalid glyph ids.
@@ -794,18 +791,16 @@
info = SkTBitOr<SkAdvancedTypefaceMetrics::PerGlyphInfo>(
info, SkAdvancedTypefaceMetrics::kHAdvance_PerGlyphInfo);
#endif
- fontMetrics =
- SkFontHost::GetAdvancedTypefaceMetrics(fontID, info, NULL, 0);
- SkSafeUnref(fontMetrics.get()); // SkRefPtr and Get both took a ref.
+ fontMetrics.reset(
+ SkFontHost::GetAdvancedTypefaceMetrics(fontID, info, NULL, 0));
#if defined (SK_SFNTLY_SUBSETTER)
- if (fontMetrics &&
+ if (fontMetrics.get() &&
fontMetrics->fType != SkAdvancedTypefaceMetrics::kTrueType_Font) {
// Font does not support subsetting, get new info with advance.
info = SkTBitOr<SkAdvancedTypefaceMetrics::PerGlyphInfo>(
info, SkAdvancedTypefaceMetrics::kHAdvance_PerGlyphInfo);
- fontMetrics =
- SkFontHost::GetAdvancedTypefaceMetrics(fontID, info, NULL, 0);
- SkSafeUnref(fontMetrics.get()); // SkRefPtr and Get both took a ref
+ fontMetrics.reset(
+ SkFontHost::GetAdvancedTypefaceMetrics(fontID, info, NULL, 0));
}
#endif
}
@@ -856,6 +851,8 @@
fFirstGlyphID(1),
fLastGlyphID(info ? info->fLastGlyphID : 0),
fFontInfo(info) {
+ SkSafeRef(typeface);
+ SkSafeRef(info);
if (info == NULL) {
fFontType = SkAdvancedTypefaceMetrics::kNotEmbeddable_Font;
} else if (info->fMultiMaster) {
@@ -906,7 +903,8 @@
if (info == NULL || info == fFontInfo.get()) {
return;
}
- fFontInfo = info;
+ fFontInfo.reset(info);
+ SkSafeRef(info);
}
uint16_t SkPDFFont::firstGlyphID() const {
@@ -924,6 +922,7 @@
void SkPDFFont::addResource(SkPDFObject* object) {
SkASSERT(object != NULL);
fResources.push(object);
+ object->ref();
}
SkPDFDict* SkPDFFont::getFontDescriptor() {
@@ -931,7 +930,8 @@
}
void SkPDFFont::setFontDescriptor(SkPDFDict* descriptor) {
- fDescriptor = descriptor;
+ fDescriptor.reset(descriptor);
+ SkSafeRef(descriptor);
}
bool SkPDFFont::addCommonFontDescriptorEntries(int16_t defaultWidth) {
@@ -1002,9 +1002,9 @@
if (fFontInfo == NULL || fFontInfo->fGlyphToUnicode.begin() == NULL) {
return;
}
- SkRefPtr<SkPDFStream> pdfCmap =
- generate_tounicode_cmap(fFontInfo->fGlyphToUnicode, subset);
- addResource(pdfCmap.get()); // Pass reference from new.
+ SkAutoTUnref<SkPDFStream> pdfCmap(
+ generate_tounicode_cmap(fFontInfo->fGlyphToUnicode, subset));
+ addResource(pdfCmap.get());
insert("ToUnicode", new SkPDFObjRef(pdfCmap.get()))->unref();
}
@@ -1039,14 +1039,11 @@
insertName("BaseFont", fontInfo()->fFontName);
insertName("Encoding", "Identity-H");
- SkPDFCIDFont* newCIDFont;
- newCIDFont = new SkPDFCIDFont(fontInfo(), typeface(), subset);
-
- // Pass ref new created to fResources.
- addResource(newCIDFont);
- SkRefPtr<SkPDFArray> descendantFonts = new SkPDFArray();
- descendantFonts->unref(); // SkRefPtr and new took a reference.
- descendantFonts->append(new SkPDFObjRef(newCIDFont))->unref();
+ SkAutoTUnref<SkPDFCIDFont> newCIDFont(
+ new SkPDFCIDFont(fontInfo(), typeface(), subset));
+ addResource(newCIDFont.get());
+ SkAutoTUnref<SkPDFArray> descendantFonts(new SkPDFArray());
+ descendantFonts->append(new SkPDFObjRef(newCIDFont.get()))->unref();
insert("DescendantFonts", descendantFonts.get());
populateToUnicodeTable(subset);
@@ -1069,9 +1066,9 @@
bool SkPDFCIDFont::addFontDescriptor(int16_t defaultWidth,
const SkTDArray<uint32_t>* subset) {
- SkRefPtr<SkPDFDict> descriptor = new SkPDFDict("FontDescriptor");
- descriptor->unref(); // SkRefPtr and new both took a ref.
+ SkAutoTUnref<SkPDFDict> descriptor(new SkPDFDict("FontDescriptor"));
setFontDescriptor(descriptor.get());
+ addResource(descriptor.get());
switch (getType()) {
case SkAdvancedTypefaceMetrics::kTrueType_Font: {
@@ -1084,22 +1081,20 @@
&rawStream);
SkASSERT(fontSize);
SkASSERT(rawStream);
- SkRefPtr<SkPDFStream> fontStream = rawStream;
- // SkRefPtr and new both ref()'d fontStream, pass one.
+ SkAutoTUnref<SkPDFStream> fontStream(rawStream);
addResource(fontStream.get());
fontStream->insertInt("Length1", fontSize);
descriptor->insert("FontFile2",
- new SkPDFObjRef(fontStream.get()))->unref();
+ new SkPDFObjRef(fontStream.get()))->unref();
break;
}
case SkAdvancedTypefaceMetrics::kCFF_Font:
case SkAdvancedTypefaceMetrics::kType1CID_Font: {
- SkRefPtr<SkStream> fontData =
- SkFontHost::OpenStream(SkTypeface::UniqueID(typeface()));
- fontData->unref(); // SkRefPtr and OpenStream both took a ref.
- SkRefPtr<SkPDFStream> fontStream = new SkPDFStream(fontData.get());
- // SkRefPtr and new both ref()'d fontStream, pass one.
+ SkAutoTUnref<SkStream> fontData(
+ SkFontHost::OpenStream(SkTypeface::UniqueID(typeface())));
+ SkAutoTUnref<SkPDFStream> fontStream(
+ new SkPDFStream(fontData.get()));
addResource(fontStream.get());
if (getType() == SkAdvancedTypefaceMetrics::kCFF_Font) {
@@ -1115,9 +1110,6 @@
SkASSERT(false);
}
- addResource(descriptor.get());
- descriptor->ref();
-
insert("FontDescriptor", new SkPDFObjRef(descriptor.get()))->unref();
return addCommonFontDescriptorEntries(defaultWidth);
}
@@ -1132,20 +1124,18 @@
subset->exportTo(&glyphIDs);
}
- SkRefPtr<SkAdvancedTypefaceMetrics> fontMetrics;
SkAdvancedTypefaceMetrics::PerGlyphInfo info;
info = SkAdvancedTypefaceMetrics::kGlyphNames_PerGlyphInfo;
info = SkTBitOr<SkAdvancedTypefaceMetrics::PerGlyphInfo>(
info, SkAdvancedTypefaceMetrics::kHAdvance_PerGlyphInfo);
uint32_t* glyphs = (glyphIDs.count() == 1) ? NULL : glyphIDs.begin();
uint32_t glyphsCount = glyphs ? glyphIDs.count() : 0;
- fontMetrics =
+ SkAutoTUnref<SkAdvancedTypefaceMetrics> fontMetrics(
SkFontHost::GetAdvancedTypefaceMetrics(
SkTypeface::UniqueID(typeface()),
info,
glyphs,
- glyphsCount);
- SkSafeUnref(fontMetrics.get()); // SkRefPtr and Get both took a ref
+ glyphsCount));
setFontInfo(fontMetrics.get());
addFontDescriptor(0, &glyphIDs);
} else {
@@ -1164,8 +1154,7 @@
SkASSERT(false);
}
- SkRefPtr<SkPDFDict> sysInfo = new SkPDFDict;
- sysInfo->unref(); // SkRefPtr and new both took a reference.
+ SkAutoTUnref<SkPDFDict> sysInfo(new SkPDFDict);
sysInfo->insert("Registry", new SkPDFString("Adobe"))->unref();
sysInfo->insert("Ordering", new SkPDFString("Identity"))->unref();
sysInfo->insertInt("Supplement", 0);
@@ -1173,11 +1162,10 @@
if (fontInfo()->fGlyphWidths.get()) {
int16_t defaultWidth = 0;
- SkRefPtr<SkPDFArray> widths =
+ SkAutoTUnref<SkPDFArray> widths(
composeAdvanceData(fontInfo()->fGlyphWidths.get(),
fontInfo()->fEmSize, &appendWidth,
- &defaultWidth);
- widths->unref(); // SkRefPtr and compose both took a reference.
+ &defaultWidth));
if (widths->size())
insert("W", widths.get());
if (defaultWidth != 0) {
@@ -1190,11 +1178,10 @@
defaultAdvance.fVerticalAdvance = 0;
defaultAdvance.fOriginXDisp = 0;
defaultAdvance.fOriginYDisp = 0;
- SkRefPtr<SkPDFArray> advances =
+ SkAutoTUnref<SkPDFArray> advances(
composeAdvanceData(fontInfo()->fVerticalMetrics.get(),
fontInfo()->fEmSize, &appendVerticalAdvance,
- &defaultAdvance);
- advances->unref(); // SkRefPtr and compose both took a ref.
+ &defaultAdvance));
if (advances->size())
insert("W2", advances.get());
if (defaultAdvance.fVerticalAdvance ||
@@ -1224,31 +1211,27 @@
SkPDFType1Font::~SkPDFType1Font() {}
bool SkPDFType1Font::addFontDescriptor(int16_t defaultWidth) {
- SkRefPtr<SkPDFDict> descriptor = getFontDescriptor();
- if (descriptor.get() != NULL) {
- addResource(descriptor.get());
- descriptor->ref();
- insert("FontDescriptor", new SkPDFObjRef(descriptor.get()))->unref();
+ if (getFontDescriptor() != NULL) {
+ SkPDFDict* descriptor = getFontDescriptor();
+ addResource(descriptor);
+ insert("FontDescriptor", new SkPDFObjRef(descriptor))->unref();
return true;
}
- descriptor = new SkPDFDict("FontDescriptor");
- descriptor->unref(); // SkRefPtr and new both took a ref.
+ SkAutoTUnref<SkPDFDict> descriptor(new SkPDFDict("FontDescriptor"));
setFontDescriptor(descriptor.get());
size_t header SK_INIT_TO_AVOID_WARNING;
size_t data SK_INIT_TO_AVOID_WARNING;
size_t trailer SK_INIT_TO_AVOID_WARNING;
- SkRefPtr<SkStream> rawFontData =
- SkFontHost::OpenStream(SkTypeface::UniqueID(typeface()));
- rawFontData->unref(); // SkRefPtr and OpenStream both took a ref.
+ SkAutoTUnref<SkStream> rawFontData(
+ SkFontHost::OpenStream(SkTypeface::UniqueID(typeface())));
SkStream* fontData = handleType1Stream(rawFontData.get(), &header, &data,
&trailer);
if (fontData == NULL) {
return false;
}
- SkRefPtr<SkPDFStream> fontStream = new SkPDFStream(fontData);
- // SkRefPtr and new both ref()'d fontStream, pass one.
+ SkAutoTUnref<SkPDFStream> fontStream(new SkPDFStream(fontData));
addResource(fontStream.get());
fontStream->insertInt("Length1", header);
fontStream->insertInt("Length2", data);
@@ -1256,7 +1239,6 @@
descriptor->insert("FontFile", new SkPDFObjRef(fontStream.get()))->unref();
addResource(descriptor.get());
- descriptor->ref();
insert("FontDescriptor", new SkPDFObjRef(descriptor.get()))->unref();
return addCommonFontDescriptorEntries(defaultWidth);
@@ -1297,12 +1279,10 @@
addWidthInfoFromRange(defaultWidth, widthRangeEntry);
- SkRefPtr<SkPDFDict> encoding = new SkPDFDict("Encoding");
- encoding->unref(); // SkRefPtr and new both took a reference.
+ SkAutoTUnref<SkPDFDict> encoding(new SkPDFDict("Encoding"));
insert("Encoding", encoding.get());
- SkRefPtr<SkPDFArray> encDiffs = new SkPDFArray;
- encDiffs->unref(); // SkRefPtr and new both took a reference.
+ SkAutoTUnref<SkPDFArray> encDiffs(new SkPDFArray);
encoding->insert("Differences", encDiffs.get());
encDiffs->reserve(lastGlyphID() - firstGlyphID() + 2);
@@ -1317,8 +1297,7 @@
void SkPDFType1Font::addWidthInfoFromRange(
int16_t defaultWidth,
const SkAdvancedTypefaceMetrics::WidthRange* widthRangeEntry) {
- SkRefPtr<SkPDFArray> widthArray = new SkPDFArray();
- widthArray->unref(); // SkRefPtr and new both took a ref.
+ SkAutoTUnref<SkPDFArray> widthArray(new SkPDFArray());
int firstChar = 0;
if (widthRangeEntry) {
const uint16_t emSize = fontInfo()->fEmSize;
@@ -1377,22 +1356,18 @@
fontMatrix.setScale(SkScalarInvert(1000), -SkScalarInvert(1000));
insert("FontMatrix", SkPDFUtils::MatrixToArray(fontMatrix))->unref();
- SkRefPtr<SkPDFDict> charProcs = new SkPDFDict;
- charProcs->unref(); // SkRefPtr and new both took a reference.
+ SkAutoTUnref<SkPDFDict> charProcs(new SkPDFDict);
insert("CharProcs", charProcs.get());
- SkRefPtr<SkPDFDict> encoding = new SkPDFDict("Encoding");
- encoding->unref(); // SkRefPtr and new both took a reference.
+ SkAutoTUnref<SkPDFDict> encoding(new SkPDFDict("Encoding"));
insert("Encoding", encoding.get());
- SkRefPtr<SkPDFArray> encDiffs = new SkPDFArray;
- encDiffs->unref(); // SkRefPtr and new both took a reference.
+ SkAutoTUnref<SkPDFArray> encDiffs(new SkPDFArray);
encoding->insert("Differences", encDiffs.get());
encDiffs->reserve(lastGlyphID() - firstGlyphID() + 2);
encDiffs->appendInt(1);
- SkRefPtr<SkPDFArray> widthArray = new SkPDFArray();
- widthArray->unref(); // SkRefPtr and new both took a ref.
+ SkAutoTUnref<SkPDFArray> widthArray(new SkPDFArray());
SkIRect bbox = SkIRect::MakeEmpty();
for (int gID = firstGlyphID(); gID <= lastGlyphID(); gID++) {
@@ -1415,13 +1390,11 @@
SkPDFUtils::PaintPath(paint.getStyle(), path->getFillType(),
&content);
}
- SkRefPtr<SkMemoryStream> glyphStream = new SkMemoryStream();
- glyphStream->unref(); // SkRefPtr and new both took a ref.
+ SkAutoTUnref<SkMemoryStream> glyphStream(new SkMemoryStream());
glyphStream->setData(content.copyToData())->unref();
- SkRefPtr<SkPDFStream> glyphDescription =
- new SkPDFStream(glyphStream.get());
- // SkRefPtr and new both ref()'d charProcs, pass one.
+ SkAutoTUnref<SkPDFStream> glyphDescription(
+ new SkPDFStream(glyphStream.get()));
addResource(glyphDescription.get());
charProcs->insert(characterName.c_str(),
new SkPDFObjRef(glyphDescription.get()))->unref();
diff --git a/src/pdf/SkPDFFont.h b/src/pdf/SkPDFFont.h
index f463ed7..693b911 100644
--- a/src/pdf/SkPDFFont.h
+++ b/src/pdf/SkPDFFont.h
@@ -180,7 +180,7 @@
FontRec(SkPDFFont* font, uint32_t fontID, uint16_t fGlyphID);
};
- SkRefPtr<SkTypeface> fTypeface;
+ SkAutoTUnref<SkTypeface> fTypeface;
// The glyph IDs accessible with this font. For Type1 (non CID) fonts,
// this will be a subset if the font has more than 255 glyphs.
@@ -188,9 +188,9 @@
uint16_t fLastGlyphID;
// The font info is only kept around after construction for large
// Type1 (non CID) fonts that need multiple "fonts" to access all glyphs.
- SkRefPtr<SkAdvancedTypefaceMetrics> fFontInfo;
+ SkAutoTUnref<SkAdvancedTypefaceMetrics> fFontInfo;
SkTDArray<SkPDFObject*> fResources;
- SkRefPtr<SkPDFDict> fDescriptor;
+ SkAutoTUnref<SkPDFDict> fDescriptor;
SkAdvancedTypefaceMetrics::FontType fFontType;
diff --git a/src/pdf/SkPDFFormXObject.cpp b/src/pdf/SkPDFFormXObject.cpp
index e148056..5e33995 100644
--- a/src/pdf/SkPDFFormXObject.cpp
+++ b/src/pdf/SkPDFFormXObject.cpp
@@ -31,8 +31,7 @@
getResources(&dummy_resourceList);
#endif
- SkRefPtr<SkStream> content = device->content();
- content->unref(); // SkRefPtr and content() both took a reference.
+ SkAutoTUnref<SkStream> content(device->content());
setData(content.get());
insertName("Type", "XObject");
@@ -55,8 +54,7 @@
// Right now SkPDFFormXObject is only used for saveLayer, which implies
// isolated blending. Do this conditionally if that changes.
- SkRefPtr<SkPDFDict> group = new SkPDFDict("Group");
- group->unref(); // SkRefPtr and new both took a reference.
+ SkAutoTUnref<SkPDFDict> group(new SkPDFDict("Group"));
group->insertName("S", "Transparency");
group->insert("I", new SkPDFBool(true))->unref(); // Isolated.
insert("Group", group.get());
diff --git a/src/pdf/SkPDFGraphicState.cpp b/src/pdf/SkPDFGraphicState.cpp
index ec9b0e7..c326b3b 100644
--- a/src/pdf/SkPDFGraphicState.cpp
+++ b/src/pdf/SkPDFGraphicState.cpp
@@ -113,16 +113,14 @@
if (!invertFunction) {
// Acrobat crashes if we use a type 0 function, kpdf crashes if we use
// a type 2 function, so we use a type 4 function.
- SkRefPtr<SkPDFArray> domainAndRange = new SkPDFArray;
- domainAndRange->unref(); // SkRefPtr and new both took a reference.
+ SkAutoTUnref<SkPDFArray> domainAndRange(new SkPDFArray);
domainAndRange->reserve(2);
domainAndRange->appendInt(0);
domainAndRange->appendInt(1);
static const char psInvert[] = "{1 exch sub}";
- SkRefPtr<SkMemoryStream> psInvertStream =
- new SkMemoryStream(&psInvert, strlen(psInvert), true);
- psInvertStream->unref(); // SkRefPtr and new both took a reference.
+ SkAutoTUnref<SkMemoryStream> psInvertStream(
+ new SkMemoryStream(&psInvert, strlen(psInvert), true));
invertFunction = new SkPDFStream(psInvertStream.get());
invertFunction->insertInt("FunctionType", 4);
@@ -139,8 +137,7 @@
// enough that it's not worth canonicalizing.
SkAutoMutexAcquire lock(CanonicalPaintsMutex());
- SkRefPtr<SkPDFDict> sMaskDict = new SkPDFDict("Mask");
- sMaskDict->unref(); // SkRefPtr and new both took a reference.
+ SkAutoTUnref<SkPDFDict> sMaskDict(new SkPDFDict("Mask"));
sMaskDict->insertName("S", "Alpha");
sMaskDict->insert("G", new SkPDFObjRef(sMask))->unref();
@@ -200,9 +197,8 @@
fPopulated = true;
insertName("Type", "ExtGState");
- SkRefPtr<SkPDFScalar> alpha =
- new SkPDFScalar(SkScalarDiv(fPaint.getAlpha(), 0xFF));
- alpha->unref(); // SkRefPtr and new both took a reference.
+ SkAutoTUnref<SkPDFScalar> alpha(
+ new SkPDFScalar(SkScalarDiv(fPaint.getAlpha(), 0xFF)));
insert("CA", alpha.get());
insert("ca", alpha.get());
diff --git a/src/pdf/SkPDFImage.cpp b/src/pdf/SkPDFImage.cpp
index 429667a..1b93f6e 100644
--- a/src/pdf/SkPDFImage.cpp
+++ b/src/pdf/SkPDFImage.cpp
@@ -305,8 +305,7 @@
if (!doingAlpha && alphaOnly) {
// For alpha only images, we stretch a single pixel of black for
// the color/shape part.
- SkRefPtr<SkPDFInt> one = new SkPDFInt(1);
- one->unref(); // SkRefPtr and new both took a reference.
+ SkAutoTUnref<SkPDFInt> one(new SkPDFInt(1));
insert("Width", one.get());
insert("Height", one.get());
} else {
@@ -335,16 +334,12 @@
insertInt("BitsPerComponent", bitsPerComp);
if (config == SkBitmap::kRGB_565_Config) {
- SkRefPtr<SkPDFInt> zeroVal = new SkPDFInt(0);
- zeroVal->unref(); // SkRefPtr and new both took a reference.
- SkRefPtr<SkPDFScalar> scale5Val =
- new SkPDFScalar(SkFloatToScalar(8.2258f)); // 255/2^5-1
- scale5Val->unref(); // SkRefPtr and new both took a reference.
- SkRefPtr<SkPDFScalar> scale6Val =
- new SkPDFScalar(SkFloatToScalar(4.0476f)); // 255/2^6-1
- scale6Val->unref(); // SkRefPtr and new both took a reference.
- SkRefPtr<SkPDFArray> decodeValue = new SkPDFArray();
- decodeValue->unref(); // SkRefPtr and new both took a reference.
+ SkAutoTUnref<SkPDFInt> zeroVal(new SkPDFInt(0));
+ SkAutoTUnref<SkPDFScalar> scale5Val(
+ new SkPDFScalar(SkFloatToScalar(8.2258f))); // 255/2^5-1
+ SkAutoTUnref<SkPDFScalar> scale6Val(
+ new SkPDFScalar(SkFloatToScalar(4.0476f))); // 255/2^6-1
+ SkAutoTUnref<SkPDFArray> decodeValue(new SkPDFArray());
decodeValue->reserve(6);
decodeValue->append(zeroVal.get());
decodeValue->append(scale5Val.get());
diff --git a/src/pdf/SkPDFPage.cpp b/src/pdf/SkPDFPage.cpp
index 717f435..a18beb1 100644
--- a/src/pdf/SkPDFPage.cpp
+++ b/src/pdf/SkPDFPage.cpp
@@ -15,6 +15,7 @@
SkPDFPage::SkPDFPage(SkPDFDevice* content)
: SkPDFDict("Page"),
fDevice(content) {
+ SkSafeRef(content);
}
SkPDFPage::~SkPDFPage() {}
@@ -32,10 +33,8 @@
}
}
- SkRefPtr<SkStream> content = fDevice->content();
- content->unref(); // SkRefPtr and content() both took a reference.
- fContentStream = new SkPDFStream(content.get());
- fContentStream->unref(); // SkRefPtr and new both took a reference.
+ SkAutoTUnref<SkStream> content(fDevice->content());
+ fContentStream.reset(new SkPDFStream(content.get()));
insert("Contents", new SkPDFObjRef(fContentStream.get()))->unref();
}
catalog->addObject(fContentStream.get(), firstPage);
@@ -67,12 +66,9 @@
// one child.
static const int kNodeSize = 8;
- SkRefPtr<SkPDFName> kidsName = new SkPDFName("Kids");
- kidsName->unref(); // SkRefPtr and new both took a reference.
- SkRefPtr<SkPDFName> countName = new SkPDFName("Count");
- countName->unref(); // SkRefPtr and new both took a reference.
- SkRefPtr<SkPDFName> parentName = new SkPDFName("Parent");
- parentName->unref(); // SkRefPtr and new both took a reference.
+ SkAutoTUnref<SkPDFName> kidsName(new SkPDFName("Kids"));
+ SkAutoTUnref<SkPDFName> countName(new SkPDFName("Count"));
+ SkAutoTUnref<SkPDFName> parentName(new SkPDFName("Parent"));
// curNodes takes a reference to its items, which it passes to pageTree.
SkTDArray<SkPDFDict*> curNodes;
@@ -95,11 +91,9 @@
}
SkPDFDict* newNode = new SkPDFDict("Pages");
- SkRefPtr<SkPDFObjRef> newNodeRef = new SkPDFObjRef(newNode);
- newNodeRef->unref(); // SkRefPtr and new both took a reference.
+ SkAutoTUnref<SkPDFObjRef> newNodeRef(new SkPDFObjRef(newNode));
- SkRefPtr<SkPDFArray> kids = new SkPDFArray;
- kids->unref(); // SkRefPtr and new both took a reference.
+ SkAutoTUnref<SkPDFArray> kids(new SkPDFArray);
kids->reserve(kNodeSize);
int count = 0;
diff --git a/src/pdf/SkPDFPage.h b/src/pdf/SkPDFPage.h
index 8ef909e..72ba335 100644
--- a/src/pdf/SkPDFPage.h
+++ b/src/pdf/SkPDFPage.h
@@ -91,10 +91,10 @@
private:
// Multiple pages may reference the content.
- SkRefPtr<SkPDFDevice> fDevice;
+ SkAutoTUnref<SkPDFDevice> fDevice;
// Once the content is finalized, put it into a stream for output.
- SkRefPtr<SkPDFStream> fContentStream;
+ SkAutoTUnref<SkPDFStream> fContentStream;
};
#endif
diff --git a/src/pdf/SkPDFShader.cpp b/src/pdf/SkPDFShader.cpp
index db5beb8..7958de3 100644
--- a/src/pdf/SkPDFShader.cpp
+++ b/src/pdf/SkPDFShader.cpp
@@ -612,8 +612,7 @@
return;
}
- SkRefPtr<SkPDFArray> domain = new SkPDFArray;
- domain->unref(); // SkRefPtr and new both took a reference.
+ SkAutoTUnref<SkPDFArray> domain(new SkPDFArray);
domain->reserve(4);
domain->appendScalar(bbox.fLeft);
domain->appendScalar(bbox.fRight);
@@ -640,16 +639,14 @@
functionCode = codeFunction(*info);
}
- SkRefPtr<SkPDFStream> function = makePSFunction(functionCode, domain.get());
- // Pass one reference to fResources, SkRefPtr and new both took a reference.
- fResources.push(function.get());
-
- SkRefPtr<SkPDFDict> pdfShader = new SkPDFDict;
- pdfShader->unref(); // SkRefPtr and new both took a reference.
+ SkAutoTUnref<SkPDFDict> pdfShader(new SkPDFDict);
pdfShader->insertInt("ShadingType", 1);
pdfShader->insertName("ColorSpace", "DeviceRGB");
pdfShader->insert("Domain", domain.get());
- pdfShader->insert("Function", new SkPDFObjRef(function.get()))->unref();
+
+ SkPDFStream* function = makePSFunction(functionCode, domain.get());
+ pdfShader->insert("Function", new SkPDFObjRef(function))->unref();
+ fResources.push(function); // Pass ownership to resource list.
insertInt("PatternType", 2);
insert("Matrix", SkPDFUtils::MatrixToArray(finalMatrix))->unref();
@@ -825,8 +822,7 @@
}
}
- SkRefPtr<SkPDFArray> patternBBoxArray = new SkPDFArray;
- patternBBoxArray->unref(); // SkRefPtr and new both took a reference.
+ SkAutoTUnref<SkPDFArray> patternBBoxArray(new SkPDFArray);
patternBBoxArray->reserve(4);
patternBBoxArray->appendScalar(patternBBox.fLeft);
patternBBoxArray->appendScalar(patternBBox.fTop);
@@ -834,11 +830,10 @@
patternBBoxArray->appendScalar(patternBBox.fBottom);
// Put the canvas into the pattern stream (fContent).
- SkRefPtr<SkStream> content = pattern.content();
- content->unref(); // SkRefPtr and content() both took a reference.
+ SkAutoTUnref<SkStream> content(pattern.content());
+ setData(content.get());
pattern.getResources(&fResources, false);
- setData(content.get());
insertName("Type", "Pattern");
insertInt("PatternType", 1);
insertInt("PaintType", 1);
diff --git a/src/pdf/SkPDFStream.cpp b/src/pdf/SkPDFStream.cpp
index d113a0b..38e874e 100644
--- a/src/pdf/SkPDFStream.cpp
+++ b/src/pdf/SkPDFStream.cpp
@@ -21,19 +21,20 @@
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 = stream;
- fData->unref(); // SkRefPtr and new both took a reference.
+ fData.reset(stream); // Transfer ownership.
}
SkPDFStream::SkPDFStream(const SkPDFStream& pdfStream)
: SkPDFDict(),
fState(kUnused_State),
- fData(pdfStream.fData) {
+ fData(pdfStream.fData.get()) {
+ fData.get()->ref();
bool removeLength = true;
// Don't uncompress an already compressed stream, but we could.
if (pdfStream.fState == kCompressed_State) {
@@ -84,7 +85,8 @@
SkPDFStream::SkPDFStream() : fState(kUnused_State) {}
void SkPDFStream::setData(SkStream* stream) {
- fData = stream;
+ fData.reset(stream);
+ SkSafeRef(stream);
}
bool SkPDFStream::populate(SkPDFCatalog* catalog) {
@@ -96,8 +98,7 @@
if (compressedData.getOffset() < fData->getLength()) {
SkMemoryStream* stream = new SkMemoryStream;
stream->setData(compressedData.copyToData())->unref();
- fData = stream;
- fData->unref(); // SkRefPtr and new both took a reference.
+ fData.reset(stream); // Transfer ownership.
insertName("Filter", "FlateDecode");
}
fState = kCompressed_State;
@@ -108,8 +109,7 @@
} else if (fState == kNoCompression_State && !skip_compression(catalog) &&
SkFlate::HaveFlate()) {
if (!fSubstitute.get()) {
- fSubstitute = new SkPDFStream(*this);
- fSubstitute->unref(); // SkRefPtr and new both took a reference.
+ fSubstitute.reset(new SkPDFStream(*this));
catalog->setSubstitute(this, fSubstitute.get());
}
return false;
diff --git a/src/pdf/SkPDFStream.h b/src/pdf/SkPDFStream.h
index b3a7ad3..6f7a08e 100644
--- a/src/pdf/SkPDFStream.h
+++ b/src/pdf/SkPDFStream.h
@@ -62,8 +62,8 @@
State fState;
// TODO(vandebo): Use SkData (after removing deprecated constructor).
- SkRefPtr<SkStream> fData;
- SkRefPtr<SkPDFStream> fSubstitute;
+ SkAutoTUnref<SkStream> fData;
+ SkAutoTUnref<SkPDFStream> fSubstitute;
typedef SkPDFDict INHERITED;
diff --git a/src/pdf/SkPDFTypes.cpp b/src/pdf/SkPDFTypes.cpp
index 7fb1e95..59250c8 100644
--- a/src/pdf/SkPDFTypes.cpp
+++ b/src/pdf/SkPDFTypes.cpp
@@ -73,7 +73,10 @@
}
}
-SkPDFObjRef::SkPDFObjRef(SkPDFObject* obj) : fObj(obj) {}
+SkPDFObjRef::SkPDFObjRef(SkPDFObject* obj) : fObj(obj) {
+ SkSafeRef(obj);
+}
+
SkPDFObjRef::~SkPDFObjRef() {}
void SkPDFObjRef::emitObject(SkWStream* stream, SkPDFCatalog* catalog,
diff --git a/src/pdf/SkPDFTypes.h b/src/pdf/SkPDFTypes.h
index 28034ef..03799d0 100644
--- a/src/pdf/SkPDFTypes.h
+++ b/src/pdf/SkPDFTypes.h
@@ -112,7 +112,7 @@
virtual size_t getOutputSize(SkPDFCatalog* catalog, bool indirect);
private:
- SkRefPtr<SkPDFObject> fObj;
+ SkAutoTUnref<SkPDFObject> fObj;
typedef SkPDFObject INHERITED;
};
diff --git a/tests/PDFPrimitivesTest.cpp b/tests/PDFPrimitivesTest.cpp
index 5cbb905..42fc133 100644
--- a/tests/PDFPrimitivesTest.cpp
+++ b/tests/PDFPrimitivesTest.cpp
@@ -94,11 +94,9 @@
static void TestPDFStream(skiatest::Reporter* reporter) {
char streamBytes[] = "Test\nFoo\tBar";
- SkRefPtr<SkMemoryStream> streamData = new SkMemoryStream(
- streamBytes, strlen(streamBytes), true);
- streamData->unref(); // SkRefPtr and new both took a reference.
- SkRefPtr<SkPDFStream> stream = new SkPDFStream(streamData.get());
- stream->unref(); // SkRefPtr and new both took a reference.
+ SkAutoTUnref<SkMemoryStream> streamData(new SkMemoryStream(
+ streamBytes, strlen(streamBytes), true));
+ SkAutoTUnref<SkPDFStream> stream(new SkPDFStream(streamData.get()));
SimpleCheckObjectOutput(
reporter, stream.get(),
"<</Length 12\n>> stream\nTest\nFoo\tBar\nendstream");
@@ -114,8 +112,7 @@
"with an uncompressed string.";
SkAutoDataUnref streamData2(SkData::NewWithCopy(streamBytes2,
strlen(streamBytes2)));
- SkRefPtr<SkPDFStream> stream = new SkPDFStream(streamData2.get());
- stream->unref(); // SkRefPtr and new both took a reference.
+ SkAutoTUnref<SkPDFStream> stream(new SkPDFStream(streamData2.get()));
SkDynamicMemoryWStream compressedByteStream;
SkFlate::Deflate(streamData2.get(), &compressedByteStream);
@@ -146,13 +143,11 @@
static void TestCatalog(skiatest::Reporter* reporter) {
SkPDFCatalog catalog((SkPDFDocument::Flags)0);
- SkRefPtr<SkPDFInt> int1 = new SkPDFInt(1);
- int1->unref(); // SkRefPtr and new both took a reference.
- SkRefPtr<SkPDFInt> int2 = new SkPDFInt(2);
- int2->unref(); // SkRefPtr and new both took a reference.
- SkRefPtr<SkPDFInt> int3 = new SkPDFInt(3);
- int3->unref(); // SkRefPtr and new both took a reference.
- SkRefPtr<SkPDFInt> int1Again(int1.get());
+ SkAutoTUnref<SkPDFInt> int1(new SkPDFInt(1));
+ SkAutoTUnref<SkPDFInt> int2(new SkPDFInt(2));
+ SkAutoTUnref<SkPDFInt> int3(new SkPDFInt(3));
+ int1.get()->ref();
+ SkAutoTUnref<SkPDFInt> int1Again(int1.get());
catalog.addObject(int1.get(), false);
catalog.addObject(int2.get(), false);
@@ -173,12 +168,9 @@
}
static void TestObjectRef(skiatest::Reporter* reporter) {
- SkRefPtr<SkPDFInt> int1 = new SkPDFInt(1);
- int1->unref(); // SkRefPtr and new both took a reference.
- SkRefPtr<SkPDFInt> int2 = new SkPDFInt(2);
- int2->unref(); // SkRefPtr and new both took a reference.
- SkRefPtr<SkPDFObjRef> int2ref = new SkPDFObjRef(int2.get());
- int2ref->unref(); // SkRefPtr and new both took a reference.
+ SkAutoTUnref<SkPDFInt> int1(new SkPDFInt(1));
+ SkAutoTUnref<SkPDFInt> int2(new SkPDFInt(2));
+ SkAutoTUnref<SkPDFObjRef> int2ref(new SkPDFObjRef(int2.get()));
SkPDFCatalog catalog((SkPDFDocument::Flags)0);
catalog.addObject(int1.get(), false);
@@ -195,16 +187,11 @@
}
static void TestSubstitute(skiatest::Reporter* reporter) {
- SkRefPtr<SkPDFTestDict> proxy = new SkPDFTestDict();
- proxy->unref(); // SkRefPtr and new both took a reference.
- SkRefPtr<SkPDFTestDict> stub = new SkPDFTestDict();
- stub->unref(); // SkRefPtr and new both took a reference.
- SkRefPtr<SkPDFInt> int33 = new SkPDFInt(33);
- int33->unref(); // SkRefPtr and new both took a reference.
- SkRefPtr<SkPDFDict> stubResource = new SkPDFDict();
- stubResource->unref(); // SkRefPtr and new both took a reference.
- SkRefPtr<SkPDFInt> int44 = new SkPDFInt(44);
- int44->unref(); // SkRefPtr and new both took a reference.
+ SkAutoTUnref<SkPDFTestDict> proxy(new SkPDFTestDict());
+ SkAutoTUnref<SkPDFTestDict> stub(new SkPDFTestDict());
+ SkAutoTUnref<SkPDFInt> int33(new SkPDFInt(33));
+ SkAutoTUnref<SkPDFDict> stubResource(new SkPDFDict());
+ SkAutoTUnref<SkPDFInt> int44(new SkPDFInt(44));
stub->insert("Value", int33.get());
stubResource->insert("InnerValue", int44.get());
@@ -231,89 +218,74 @@
}
static void TestPDFPrimitives(skiatest::Reporter* reporter) {
- SkRefPtr<SkPDFInt> int42 = new SkPDFInt(42);
- int42->unref(); // SkRefPtr and new both took a reference.
+ SkAutoTUnref<SkPDFInt> int42(new SkPDFInt(42));
SimpleCheckObjectOutput(reporter, int42.get(), "42");
- SkRefPtr<SkPDFScalar> realHalf = new SkPDFScalar(SK_ScalarHalf);
- realHalf->unref(); // SkRefPtr and new both took a reference.
+ SkAutoTUnref<SkPDFScalar> realHalf(new SkPDFScalar(SK_ScalarHalf));
SimpleCheckObjectOutput(reporter, realHalf.get(), "0.5");
#if defined(SK_SCALAR_IS_FLOAT)
- SkRefPtr<SkPDFScalar> bigScalar = new SkPDFScalar(110999.75f);
- bigScalar->unref(); // SkRefPtr and new both took a reference.
+ SkAutoTUnref<SkPDFScalar> bigScalar(new SkPDFScalar(110999.75f));
#if !defined(SK_ALLOW_LARGE_PDF_SCALARS)
SimpleCheckObjectOutput(reporter, bigScalar.get(), "111000");
#else
SimpleCheckObjectOutput(reporter, bigScalar.get(), "110999.75");
- SkRefPtr<SkPDFScalar> biggerScalar = new SkPDFScalar(50000000.1);
- biggerScalar->unref(); // SkRefPtr and new both took a reference.
+ SkAutoTUnref<SkPDFScalar> biggerScalar(new SkPDFScalar(50000000.1));
SimpleCheckObjectOutput(reporter, biggerScalar.get(), "50000000");
- SkRefPtr<SkPDFScalar> smallestScalar = new SkPDFScalar(1.0/65536);
- smallestScalar->unref(); // SkRefPtr and new both took a reference.
+ SkAutoTUnref<SkPDFScalar> smallestScalar(new SkPDFScalar(1.0/65536));
SimpleCheckObjectOutput(reporter, smallestScalar.get(), "0.00001526");
#endif
#endif
- SkRefPtr<SkPDFString> stringSimple = new SkPDFString("test ) string ( foo");
- stringSimple->unref(); // SkRefPtr and new both took a reference.
+ SkAutoTUnref<SkPDFString> stringSimple(
+ new SkPDFString("test ) string ( foo"));
SimpleCheckObjectOutput(reporter, stringSimple.get(),
"(test \\) string \\( foo)");
- SkRefPtr<SkPDFString> stringComplex =
- new SkPDFString("\ttest ) string ( foo");
- stringComplex->unref(); // SkRefPtr and new both took a reference.
+ SkAutoTUnref<SkPDFString> stringComplex(
+ new SkPDFString("\ttest ) string ( foo"));
SimpleCheckObjectOutput(reporter, stringComplex.get(),
"<0974657374202920737472696E67202820666F6F>");
- SkRefPtr<SkPDFName> name = new SkPDFName("Test name\twith#tab");
- name->unref(); // SkRefPtr and new both took a reference.
+ SkAutoTUnref<SkPDFName> name(new SkPDFName("Test name\twith#tab"));
const char expectedResult[] = "/Test#20name#09with#23tab";
CheckObjectOutput(reporter, name.get(), expectedResult,
strlen(expectedResult), false, false);
- SkRefPtr<SkPDFName> escapedName = new SkPDFName("A#/%()<>[]{}B");
- escapedName->unref(); // SkRefPtr and new both took a reference.
+ SkAutoTUnref<SkPDFName> escapedName(new SkPDFName("A#/%()<>[]{}B"));
const char escapedNameExpected[] = "/A#23#2F#25#28#29#3C#3E#5B#5D#7B#7DB";
CheckObjectOutput(reporter, escapedName.get(), escapedNameExpected,
strlen(escapedNameExpected), false, false);
// Test that we correctly handle characters with the high-bit set.
const unsigned char highBitCString[] = {0xDE, 0xAD, 'b', 'e', 0xEF, 0};
- SkRefPtr<SkPDFName> highBitName = new SkPDFName((const char*)highBitCString);
- highBitName->unref(); // SkRefPtr and new both took a reference.
+ SkAutoTUnref<SkPDFName> highBitName(
+ new SkPDFName((const char*)highBitCString));
const char highBitExpectedResult[] = "/#DE#ADbe#EF";
CheckObjectOutput(reporter, highBitName.get(), highBitExpectedResult,
strlen(highBitExpectedResult), false, false);
- SkRefPtr<SkPDFArray> array = new SkPDFArray;
- array->unref(); // SkRefPtr and new both took a reference.
+ SkAutoTUnref<SkPDFArray> array(new SkPDFArray);
SimpleCheckObjectOutput(reporter, array.get(), "[]");
array->append(int42.get());
SimpleCheckObjectOutput(reporter, array.get(), "[42]");
array->append(realHalf.get());
SimpleCheckObjectOutput(reporter, array.get(), "[42 0.5]");
- SkRefPtr<SkPDFInt> int0 = new SkPDFInt(0);
- int0->unref(); // SkRefPtr and new both took a reference.
+ SkAutoTUnref<SkPDFInt> int0(new SkPDFInt(0));
array->append(int0.get());
SimpleCheckObjectOutput(reporter, array.get(), "[42 0.5 0]");
- SkRefPtr<SkPDFInt> int1 = new SkPDFInt(1);
- int1->unref(); // SkRefPtr and new both took a reference.
+ SkAutoTUnref<SkPDFInt> int1(new SkPDFInt(1));
array->setAt(0, int1.get());
SimpleCheckObjectOutput(reporter, array.get(), "[1 0.5 0]");
- SkRefPtr<SkPDFDict> dict = new SkPDFDict;
- dict->unref(); // SkRefPtr and new both took a reference.
+ SkAutoTUnref<SkPDFDict> dict(new SkPDFDict);
SimpleCheckObjectOutput(reporter, dict.get(), "<<>>");
- SkRefPtr<SkPDFName> n1 = new SkPDFName("n1");
- n1->unref(); // SkRefPtr and new both took a reference.
+ SkAutoTUnref<SkPDFName> n1(new SkPDFName("n1"));
dict->insert(n1.get(), int42.get());
SimpleCheckObjectOutput(reporter, dict.get(), "<</n1 42\n>>");
- SkRefPtr<SkPDFName> n2 = new SkPDFName("n2");
- n2->unref(); // SkRefPtr and new both took a reference.
- SkRefPtr<SkPDFName> n3 = new SkPDFName("n3");
- n3->unref(); // SkRefPtr and new both took a reference.
+ SkAutoTUnref<SkPDFName> n2(new SkPDFName("n2"));
+ SkAutoTUnref<SkPDFName> n3(new SkPDFName("n3"));
dict->insert(n2.get(), realHalf.get());
dict->insert(n3.get(), array.get());
SimpleCheckObjectOutput(reporter, dict.get(),
diff --git a/tests/UtilsTest.cpp b/tests/UtilsTest.cpp
index 1c2f870..7f27f7e 100644
--- a/tests/UtilsTest.cpp
+++ b/tests/UtilsTest.cpp
@@ -27,35 +27,6 @@
SK_DEFINE_INST_COUNT(RefClass)
-static void test_refptr(skiatest::Reporter* reporter) {
- RefClass* r0 = new RefClass(0);
-
- SkRefPtr<RefClass> rc0;
- REPORTER_ASSERT(reporter, rc0.get() == NULL);
- REPORTER_ASSERT(reporter, !rc0);
-
- SkRefPtr<RefClass> rc1;
- REPORTER_ASSERT(reporter, rc0 == rc1);
- REPORTER_ASSERT(reporter, rc0.get() != r0);
-
- rc0 = r0;
- REPORTER_ASSERT(reporter, rc0);
- REPORTER_ASSERT(reporter, rc0 != rc1);
- REPORTER_ASSERT(reporter, rc0.get() == r0);
-
- rc1 = rc0;
- REPORTER_ASSERT(reporter, rc1);
- REPORTER_ASSERT(reporter, rc0 == rc1);
- REPORTER_ASSERT(reporter, rc0.get() == r0);
-
- rc0 = NULL;
- REPORTER_ASSERT(reporter, rc0.get() == NULL);
- REPORTER_ASSERT(reporter, !rc0);
- REPORTER_ASSERT(reporter, rc0 != rc1);
-
- r0->unref();
-}
-
static void test_autounref(skiatest::Reporter* reporter) {
RefClass obj(0);
REPORTER_ASSERT(reporter, 1 == obj.getRefCnt());
@@ -178,7 +149,6 @@
test_utf16(reporter);
test_search(reporter);
- test_refptr(reporter);
test_autounref(reporter);
}