aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/ports/SkFontMgr_android_parser.cpp
diff options
context:
space:
mode:
authorGravatar mtklein <mtklein@chromium.org>2016-03-16 13:53:35 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2016-03-16 13:53:35 -0700
commit18300a3aa7cb6eb55d21bb0450dffa58b6fc062c (patch)
treed1c0f54567937ed7dd44fb17842c6c1b544815d0 /src/ports/SkFontMgr_android_parser.cpp
parent830dfd87a7707f687e13da5be645e75c746a2cf5 (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_parser.cpp')
-rw-r--r--src/ports/SkFontMgr_android_parser.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/ports/SkFontMgr_android_parser.cpp b/src/ports/SkFontMgr_android_parser.cpp
index 3f9c90cf31..dbc1dee92e 100644
--- a/src/ports/SkFontMgr_android_parser.cpp
+++ b/src/ports/SkFontMgr_android_parser.cpp
@@ -273,7 +273,7 @@ static const TagHandler familyHandler = {
}
},
/*end*/[](FamilyData* self, const char* tag) {
- *self->fFamilies.append() = self->fCurrentFamily.detach();
+ *self->fFamilies.append() = self->fCurrentFamily.release();
},
/*tag*/[](FamilyData* self, const char* tag, const char** attributes) -> const TagHandler* {
size_t len = strlen(tag);
@@ -473,7 +473,7 @@ static const TagHandler familyHandler = {
}
},
/*end*/[](FamilyData* self, const char* tag) {
- *self->fFamilies.append() = self->fCurrentFamily.detach();
+ *self->fFamilies.append() = self->fCurrentFamily.release();
},
/*tag*/[](FamilyData* self, const char* tag, const char** attributes) -> const TagHandler* {
size_t len = strlen(tag);