diff options
| author |  mtklein <mtklein@chromium.org> | 2016-03-17 05:36:18 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-03-17 05:36:18 -0700 |
| commit | 0e3738db89e86035ed5d4f629bf58b817b1e5274 (patch) | |
| tree | 5f09fa3a8af148a7f761fb113fb9f8e987c85d05 /src/core | |
| parent | d3cfd94228e6e58bb43dc4f799b4e443fba027a3 (diff) | |
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
Review URL: https://codereview.chromium.org/1811723002
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/SkAdvancedTypefaceMetrics.cpp | 2 | ||||
| -rw-r--r-- | src/core/SkAdvancedTypefaceMetrics.h | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/core/SkAdvancedTypefaceMetrics.cpp b/src/core/SkAdvancedTypefaceMetrics.cpp index b5b49e3ac5..28079f98e9 100644 --- a/src/core/SkAdvancedTypefaceMetrics.cpp +++ b/src/core/SkAdvancedTypefaceMetrics.cpp @@ -245,7 +245,7 @@ SkAdvancedTypefaceMetrics::AdvanceMetric<Data>* getAdvanceData( if (curRange->fStartId == lastIndex) { SkASSERT(prevRange); SkASSERT(prevRange->fNext->fStartId == lastIndex); - prevRange->fNext.free(); + prevRange->fNext.reset(); } else { finishRange(curRange, lastIndex - 1, SkAdvancedTypefaceMetrics::WidthRange::kRange); diff --git a/src/core/SkAdvancedTypefaceMetrics.h b/src/core/SkAdvancedTypefaceMetrics.h index 92655d21b2..424e5f3f51 100644 --- a/src/core/SkAdvancedTypefaceMetrics.h +++ b/src/core/SkAdvancedTypefaceMetrics.h @@ -28,13 +28,12 @@ public: T* get() const { return fPtr; } T* operator->() const { return fPtr; } - void reset(T* ptr) { + void reset(T* ptr = nullptr) { if (ptr != fPtr) { delete fPtr; fPtr = ptr; } } - void free() { this->reset(nullptr); } T* release() { T* ptr = fPtr; fPtr = nullptr; |