diff options
author | mtklein <mtklein@chromium.org> | 2016-03-16 13:53:35 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-03-16 13:53:35 -0700 |
commit | 18300a3aa7cb6eb55d21bb0450dffa58b6fc062c (patch) | |
tree | d1c0f54567937ed7dd44fb17842c6c1b544815d0 /src/core/SkFontDescriptor.h | |
parent | 830dfd87a7707f687e13da5be645e75c746a2cf5 (diff) |
detach -> release
The C++ standard library uses the name "release" for the operation we call "detach".
Rewriting each "detach(" to "release(" brings us a step closer to using standard library types directly (e.g. std::unique_ptr instead of SkAutoTDelete).
This was a fairly blind transformation. There may have been unintentional conversions in here, but it's probably for the best to have everything uniformly say "release".
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1809733002
Review URL: https://codereview.chromium.org/1809733002
Diffstat (limited to 'src/core/SkFontDescriptor.h')
-rw-r--r-- | src/core/SkFontDescriptor.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/SkFontDescriptor.h b/src/core/SkFontDescriptor.h index 095ecce60a..cfdc571570 100644 --- a/src/core/SkFontDescriptor.h +++ b/src/core/SkFontDescriptor.h @@ -34,7 +34,7 @@ public: } bool hasStream() const { return fStream.get() != nullptr; } SkStreamAsset* duplicateStream() const { return fStream->duplicate(); } - SkStreamAsset* detachStream() { return fStream.detach(); } + SkStreamAsset* detachStream() { return fStream.release(); } SkStreamAsset* getStream() { return fStream.get(); } int getIndex() const { return fIndex; } int getAxisCount() const { return fAxisCount; } @@ -62,7 +62,7 @@ public: const char* getFullName() const { return fFullName.c_str(); } const char* getPostscriptName() const { return fPostscriptName.c_str(); } bool hasFontData() const { return fFontData.get() != nullptr; } - SkFontData* detachFontData() { return fFontData.detach(); } + SkFontData* detachFontData() { return fFontData.release(); } void setFamilyName(const char* name) { fFamilyName.set(name); } void setFullName(const char* name) { fFullName.set(name); } |