From 18300a3aa7cb6eb55d21bb0450dffa58b6fc062c Mon Sep 17 00:00:00 2001 From: mtklein Date: Wed, 16 Mar 2016 13:53:35 -0700 Subject: 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 --- src/ports/SkFontMgr_fontconfig.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/ports/SkFontMgr_fontconfig.cpp') diff --git a/src/ports/SkFontMgr_fontconfig.cpp b/src/ports/SkFontMgr_fontconfig.cpp index bd6a5a2a2a..089be5cdbe 100644 --- a/src/ports/SkFontMgr_fontconfig.cpp +++ b/src/ports/SkFontMgr_fontconfig.cpp @@ -196,8 +196,8 @@ static SkWeakReturn is_weak(FcPattern* pattern, const char object[], int id) { FcPatternAddString(weak, object, (const FcChar8*)"nomatchstring"); FcPatternAddLangSet(weak, FC_LANG, weakLangSet); - FcFontSetAdd(fontSet, strong.detach()); - FcFontSetAdd(fontSet, weak.detach()); + FcFontSetAdd(fontSet, strong.release()); + FcFontSetAdd(fontSet, weak.release()); // Add 'matchlang' to the copy of the pattern. FcPatternAddLangSet(minimal, FC_LANG, weakLangSet); @@ -725,7 +725,7 @@ protected: } } - return new StyleSet(this, matches.detach()); + return new StyleSet(this, matches.release()); } virtual SkTypeface* onMatchFamilyStyle(const char familyName[], @@ -830,7 +830,7 @@ protected: return nullptr; } - return new SkTypeface_stream(new SkFontData(stream.detach(), ttcIndex, nullptr, 0), style, + return new SkTypeface_stream(new SkFontData(stream.release(), ttcIndex, nullptr, 0), style, isFixedWidth); } @@ -852,7 +852,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_stream(data, style, isFixedPitch); } @@ -893,7 +893,7 @@ protected: : SkFontStyle::kUpright_Slant); SkAutoTUnref typeface(this->matchFamilyStyle(familyName, style)); if (typeface.get()) { - return typeface.detach(); + return typeface.release(); } return this->matchFamilyStyle(nullptr, style); -- cgit v1.2.3