Revert of free -> reset (patchset #3 id:40001 of https://codereview.chromium.org/1811723002/ )
Reason for revert:
Suspect for Win10 failures.
Original issue's description:
> free -> reset
>
> The C++ standard library uses ".reset()" where we sometimes write ".free()".
> We also use ".reset()" quite a lot. This standardizes on ".reset()".
>
> This is one more step towards dropping SkAutoTDelete in favor of the standard
> std::unique_ptr.
>
> BUG=skia:
> GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1811723002
>
> Committed: https://skia.googlesource.com/skia/+/0e3738db89e86035ed5d4f629bf58b817b1e5274
TBR=reed@google.com,mtklein@google.com,mtklein@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Review URL: https://codereview.chromium.org/1813843002
diff --git a/bench/GrMemoryPoolBench.cpp b/bench/GrMemoryPoolBench.cpp
index f1872fc..3efe653 100644
--- a/bench/GrMemoryPoolBench.cpp
+++ b/bench/GrMemoryPoolBench.cpp
@@ -117,7 +117,7 @@
if (nullptr == objects[idx].get()) {
objects[idx].reset(new B);
} else {
- objects[idx].reset();
+ objects[idx].free();
}
}
}
diff --git a/dm/DMSrcSink.cpp b/dm/DMSrcSink.cpp
index e9211e5..27cb6aa 100644
--- a/dm/DMSrcSink.cpp
+++ b/dm/DMSrcSink.cpp
@@ -1411,7 +1411,7 @@
}
mojoPicture = SkMojo::FlattenedPicture::New();
mojoPicture->Deserialize(storage.get());
- storage.reset();
+ storage.free();
if (!mojoPicture) {
return "SkMojo::FlattenedPicture::Deserialize failed";
}
diff --git a/include/core/SkTypes.h b/include/core/SkTypes.h
index 1051f08..27280d4 100644
--- a/include/core/SkTypes.h
+++ b/include/core/SkTypes.h
@@ -519,7 +519,7 @@
/** Free the current buffer, and set the internal reference to NULL. Same
as calling sk_free(release())
*/
- void reset() {
+ void free() {
sk_free(fPtr);
fPtr = NULL;
}
@@ -571,7 +571,7 @@
/**
* Reallocates the block to a new size. The ptr may or may not change.
*/
- void* reset(size_t size = 0, OnShrink shrink = kAlloc_OnShrink, bool* didChangeAlloc = NULL) {
+ void* reset(size_t size, OnShrink shrink = kAlloc_OnShrink, bool* didChangeAlloc = NULL) {
if (size == fSize || (kReuse_OnShrink == shrink && size < fSize)) {
if (didChangeAlloc) {
*didChangeAlloc = false;
@@ -590,6 +590,13 @@
}
/**
+ * Releases the block back to the heap
+ */
+ void free() {
+ this->reset(0);
+ }
+
+ /**
* Return the allocated block.
*/
void* get() { return fPtr; }
diff --git a/include/private/SkTemplates.h b/include/private/SkTemplates.h
index e8fbfd5..d83ffc8 100644
--- a/include/private/SkTemplates.h
+++ b/include/private/SkTemplates.h
@@ -96,6 +96,7 @@
SkAutoTDelete(T* obj = NULL) : std::unique_ptr<T>(obj) {}
operator T*() const { return this->get(); }
+ void free() { this->reset(nullptr); }
#if defined(SK_BUILD_FOR_ANDROID_FRAMEWORK)
// Need to update graphics/BitmapRegionDecoder.cpp.
@@ -109,6 +110,8 @@
template <typename T> class SkAutoTDeleteArray : public std::unique_ptr<T[]> {
public:
SkAutoTDeleteArray(T array[]) : std::unique_ptr<T[]>(array) {}
+
+ void free() { this->reset(nullptr); }
};
/** Allocate an array of T elements, and free the array in the destructor
@@ -283,9 +286,9 @@
}
/** Resize the memory area pointed to by the current ptr without preserving contents. */
- T* reset(size_t count = 0) {
+ T* reset(size_t count) {
sk_free(fPtr);
- fPtr = count ? (T*)sk_malloc_flags(count * sizeof(T), SK_MALLOC_THROW) : nullptr;
+ fPtr = (T*)sk_malloc_flags(count * sizeof(T), SK_MALLOC_THROW);
return fPtr;
}
@@ -308,6 +311,13 @@
}
/**
+ * Releases the block back to the heap
+ */
+ void free() {
+ this->reset(0);
+ }
+
+ /**
* Transfer ownership of the ptr to the caller, setting the internal
* pointer to NULL. Note that this differs from get(), which also returns
* the pointer, but it does not transfer ownership.
diff --git a/src/codec/SkBmpCodec.cpp b/src/codec/SkBmpCodec.cpp
index e327f79..32f1d15 100644
--- a/src/codec/SkBmpCodec.cpp
+++ b/src/codec/SkBmpCodec.cpp
@@ -392,7 +392,7 @@
alphaType = kUnpremul_SkAlphaType;
}
}
- iBuffer.reset();
+ iBuffer.free();
// Additionally, 32 bit bmp-in-icos use the alpha channel.
// FIXME (msarett): Don't all bmp-in-icos use the alpha channel?
diff --git a/src/codec/SkJpegCodec.cpp b/src/codec/SkJpegCodec.cpp
index a342cd8..2534a5f 100644
--- a/src/codec/SkJpegCodec.cpp
+++ b/src/codec/SkJpegCodec.cpp
@@ -413,7 +413,7 @@
// Remove objects used for sampling.
fSwizzler.reset(nullptr);
fSrcRow = nullptr;
- fStorage.reset();
+ fStorage.free();
// Now, given valid output dimensions, we can start the decompress
if (!jpeg_start_decompress(fDecoderMgr->dinfo())) {
diff --git a/src/codec/SkRawCodec.cpp b/src/codec/SkRawCodec.cpp
index 3b7b9a9..208bd89 100644
--- a/src/codec/SkRawCodec.cpp
+++ b/src/codec/SkRawCodec.cpp
@@ -381,7 +381,7 @@
if (fStream->getMemoryBase()) { // directly copy if getMemoryBase() is available.
SkAutoTUnref<SkData> data(SkData::NewWithCopy(
static_cast<const uint8_t*>(fStream->getMemoryBase()) + offset, bytesToRead));
- fStream.reset();
+ fStream.free();
return new SkMemoryStream(data);
} else {
SkAutoTUnref<SkData> data(SkData::NewUninitialized(bytesToRead));
diff --git a/src/core/SkAdvancedTypefaceMetrics.cpp b/src/core/SkAdvancedTypefaceMetrics.cpp
index 28079f9..b5b49e3 100644
--- a/src/core/SkAdvancedTypefaceMetrics.cpp
+++ b/src/core/SkAdvancedTypefaceMetrics.cpp
@@ -245,7 +245,7 @@
if (curRange->fStartId == lastIndex) {
SkASSERT(prevRange);
SkASSERT(prevRange->fNext->fStartId == lastIndex);
- prevRange->fNext.reset();
+ prevRange->fNext.free();
} else {
finishRange(curRange, lastIndex - 1,
SkAdvancedTypefaceMetrics::WidthRange::kRange);
diff --git a/src/core/SkAdvancedTypefaceMetrics.h b/src/core/SkAdvancedTypefaceMetrics.h
index 424e5f3..92655d2 100644
--- a/src/core/SkAdvancedTypefaceMetrics.h
+++ b/src/core/SkAdvancedTypefaceMetrics.h
@@ -28,12 +28,13 @@
T* get() const { return fPtr; }
T* operator->() const { return fPtr; }
- void reset(T* ptr = nullptr) {
+ void reset(T* ptr) {
if (ptr != fPtr) {
delete fPtr;
fPtr = ptr;
}
}
+ void free() { this->reset(nullptr); }
T* release() {
T* ptr = fPtr;
fPtr = nullptr;
diff --git a/src/gpu/GrGlyph.h b/src/gpu/GrGlyph.h
index fb998a4..55e925f 100644
--- a/src/gpu/GrGlyph.h
+++ b/src/gpu/GrGlyph.h
@@ -28,7 +28,7 @@
kCoverage_MaskStyle,
kDistance_MaskStyle
};
-
+
typedef uint32_t PackedID;
GrBatchAtlas::AtlasID fID;
@@ -49,7 +49,7 @@
fTooLargeForAtlas = GrBatchAtlas::GlyphTooLargeForAtlas(bounds.width(), bounds.height());
}
- void reset() {
+ void free() {
if (fPath) {
delete fPath;
fPath = nullptr;
@@ -86,7 +86,7 @@
static inline MaskStyle UnpackMaskStyle(PackedID packed) {
return ((packed >> 20) & 1) ? kDistance_MaskStyle : kCoverage_MaskStyle;
}
-
+
static inline uint16_t UnpackID(PackedID packed) {
return (uint16_t)packed;
}
diff --git a/src/gpu/GrLayerCache.cpp b/src/gpu/GrLayerCache.cpp
index 3c7ab88..c2facbb 100644
--- a/src/gpu/GrLayerCache.cpp
+++ b/src/gpu/GrLayerCache.cpp
@@ -98,7 +98,7 @@
SkASSERT(0 == fPictureHash.count());
// The atlas only lets go of its texture when the atlas is deleted.
- fAtlas.reset();
+ fAtlas.free();
}
void GrLayerCache::initAtlas() {
diff --git a/src/gpu/text/GrBatchFontCache.cpp b/src/gpu/text/GrBatchFontCache.cpp
index 97c55e2..d99df1d 100644
--- a/src/gpu/text/GrBatchFontCache.cpp
+++ b/src/gpu/text/GrBatchFontCache.cpp
@@ -165,7 +165,7 @@
GrBatchTextStrike::~GrBatchTextStrike() {
SkTDynamicHash<GrGlyph, GrGlyph::PackedID>::Iter iter(&fCache);
while (!iter.done()) {
- (*iter).reset();
+ (*iter).free();
++iter;
}
}
diff --git a/src/images/SkImageDecoder_libwebp.cpp b/src/images/SkImageDecoder_libwebp.cpp
index 2db08ce..5253577 100644
--- a/src/images/SkImageDecoder_libwebp.cpp
+++ b/src/images/SkImageDecoder_libwebp.cpp
@@ -224,7 +224,7 @@
break;
}
} while (VP8_STATUS_OK != status);
- srcStorage.reset();
+ srcStorage.free();
WebPIDelete(idec);
WebPFreeDecBuffer(&config->output);
diff --git a/src/pdf/SkPDFDevice.cpp b/src/pdf/SkPDFDevice.cpp
index 443bb1a..94a103a 100644
--- a/src/pdf/SkPDFDevice.cpp
+++ b/src/pdf/SkPDFDevice.cpp
@@ -732,9 +732,9 @@
}
void SkPDFDevice::init() {
- fContentEntries.reset();
+ fContentEntries.free();
fLastContentEntry = nullptr;
- fMarginContentEntries.reset();
+ fMarginContentEntries.free();
fLastMarginContentEntry = nullptr;
fDrawingArea = kContent_DrawingArea;
if (fFontGlyphUsage.get() == nullptr) {
diff --git a/src/utils/SkBitSet.cpp b/src/utils/SkBitSet.cpp
index 985bb6e..3ace15d 100755
--- a/src/utils/SkBitSet.cpp
+++ b/src/utils/SkBitSet.cpp
@@ -27,7 +27,7 @@
return *this;
}
fBitCount = rhs.fBitCount;
- fBitData.reset();
+ fBitData.free();
fDwordCount = rhs.fDwordCount;
fBitData.set(sk_malloc_throw(fDwordCount * sizeof(uint32_t)));
memcpy(fBitData.get(), rhs.fBitData.get(), fDwordCount * sizeof(uint32_t));
diff --git a/src/xml/SkDOM.cpp b/src/xml/SkDOM.cpp
index 8b55f6c..0f0b614 100644
--- a/src/xml/SkDOM.cpp
+++ b/src/xml/SkDOM.cpp
@@ -374,7 +374,7 @@
const SkDOM::Node* SkDOM::finishParsing() {
SkASSERT(fParser);
fRoot = fParser->getRoot();
- fParser.reset();
+ fParser.free();
return fRoot;
}