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/ports/SkFontMgr_custom.cpp | |
| 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/ports/SkFontMgr_custom.cpp')
| -rw-r--r-- | src/ports/SkFontMgr_custom.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/ports/SkFontMgr_custom.cpp b/src/ports/SkFontMgr_custom.cpp index 7f3ce6b032..158ba006d4 100644 --- a/src/ports/SkFontMgr_custom.cpp +++ b/src/ports/SkFontMgr_custom.cpp @@ -296,7 +296,7 @@ protected: SkFontStyle style; SkString name; if (fScanner.scanFont(stream, ttcIndex, &name, &style, &isFixedPitch, nullptr)) { - return new SkTypeface_Stream(style, isFixedPitch, false, name, stream.detach(), + return new SkTypeface_Stream(style, isFixedPitch, false, name, stream.release(), ttcIndex); } else { return nullptr; @@ -305,7 +305,7 @@ protected: SkTypeface* onCreateFromFile(const char path[], int ttcIndex) const override { SkAutoTDelete<SkStreamAsset> stream(SkStream::NewFromFile(path)); - return stream.get() ? this->createFromStream(stream.detach(), ttcIndex) : nullptr; + return stream.get() ? this->createFromStream(stream.release(), ttcIndex) : nullptr; } SkTypeface* onLegacyCreateTypeface(const char familyName[], unsigned styleBits) const override { @@ -489,7 +489,7 @@ private: SkTypeface_Custom* tf = new SkTypeface_Stream(style, isFixedPitch, true, // system-font (cannot delete) - realname, stream.detach(), faceIndex); + realname, stream.release(), faceIndex); SkFontStyleSet_Custom* addTo = find_family(*families, realname.c_str()); if (nullptr == addTo) { |