diff options
author | 2016-03-16 13:53:35 -0700 | |
---|---|---|
committer | 2016-03-16 13:53:35 -0700 | |
commit | 18300a3aa7cb6eb55d21bb0450dffa58b6fc062c (patch) | |
tree | d1c0f54567937ed7dd44fb17842c6c1b544815d0 /src/ports/SkFontMgr_android.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_android.cpp')
-rw-r--r-- | src/ports/SkFontMgr_android.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/ports/SkFontMgr_android.cpp b/src/ports/SkFontMgr_android.cpp index 93a7d8659f..ead0bf0b83 100644 --- a/src/ports/SkFontMgr_android.cpp +++ b/src/ports/SkFontMgr_android.cpp @@ -388,7 +388,7 @@ protected: uint16_t glyphID; paint.textToGlyphs(&character, sizeof(character), &glyphID); if (glyphID != 0) { - return face.detach(); + return face.release(); } } return nullptr; @@ -438,7 +438,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* onCreateFromStream(SkStreamAsset* bareStream, int ttcIndex) const override { @@ -449,7 +449,7 @@ protected: if (!fScanner.scanFont(stream, ttcIndex, &name, &style, &isFixedPitch, nullptr)) { return nullptr; } - SkFontData* data(new SkFontData(stream.detach(), ttcIndex, nullptr, 0)); + SkFontData* data(new SkFontData(stream.release(), ttcIndex, nullptr, 0)); return new SkTypeface_AndroidStream(data, style, isFixedPitch, name); } @@ -471,7 +471,7 @@ protected: SkAutoSTMalloc<4, SkFixed> axisValues(axisDefinitions.count()); Scanner::computeAxisValues(axisDefinitions, paramAxes, paramAxisCount, axisValues, name); - SkFontData* data(new SkFontData(stream.detach(), params.getCollectionIndex(), + SkFontData* data(new SkFontData(stream.release(), params.getCollectionIndex(), axisValues.get(), axisDefinitions.count())); return new SkTypeface_AndroidStream(data, style, isFixedPitch, name); } |