aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/ports/SkFontConfigInterface_direct.cpp
diff options
context:
space:
mode:
authorGravatar bungeman <bungeman@google.com>2016-08-05 06:51:50 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2016-08-05 06:51:50 -0700
commitfeb3c1a57faee39dc10ac904f6b215ba50e286b4 (patch)
treec861461ccc43d19a3b19fe7482c5e0381baccb5a /src/ports/SkFontConfigInterface_direct.cpp
parent4c35a3f905670873b3174c5e6c9279677b4f9d54 (diff)
Move to SkDataTable::MakeXXX and sk_sp.
Change SkDataTable::NewXXX to SkDataTable::MakeXXX and return sk_sp. This updates users of SkDataTable to sk_sp as well. There do not appear to be any external users of these methods. Review-Url: https://codereview.chromium.org/2211143002
Diffstat (limited to 'src/ports/SkFontConfigInterface_direct.cpp')
-rw-r--r--src/ports/SkFontConfigInterface_direct.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/ports/SkFontConfigInterface_direct.cpp b/src/ports/SkFontConfigInterface_direct.cpp
index 3cde837b9e..3455447246 100644
--- a/src/ports/SkFontConfigInterface_direct.cpp
+++ b/src/ports/SkFontConfigInterface_direct.cpp
@@ -698,7 +698,7 @@ static bool find_name(const SkTDArray<const char*>& list, const char* str) {
return false;
}
-SkDataTable* SkFontConfigInterfaceDirect::getFamilyNames() {
+sk_sp<SkDataTable> SkFontConfigInterfaceDirect::getFamilyNames() {
FCLocker lock;
FcPattern* pat = FcPatternCreate();
@@ -730,6 +730,6 @@ SkDataTable* SkFontConfigInterfaceDirect::getFamilyNames() {
}
}
- return SkDataTable::NewCopyArrays((const void*const*)names.begin(),
- sizes.begin(), names.count());
+ return SkDataTable::MakeCopyArrays((const void*const*)names.begin(),
+ sizes.begin(), names.count());
}