aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/fonts/SkFontMgr_fontconfig.cpp
diff options
context:
space:
mode:
authorGravatar halcanary <halcanary@google.com>2015-08-26 13:07:48 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2015-08-26 13:07:49 -0700
commit385fe4d4b62d7d1dd76116dd570df3290a2f487b (patch)
tree53d982ff238828331e86acd44071a44162a8688c /src/fonts/SkFontMgr_fontconfig.cpp
parent5015176adf046ef906a2313b6e6b64b72cc84898 (diff)
Style Change: SkNEW->new; SkDELETE->delete
Diffstat (limited to 'src/fonts/SkFontMgr_fontconfig.cpp')
-rw-r--r--src/fonts/SkFontMgr_fontconfig.cpp13
1 files changed, 5 insertions, 8 deletions
diff --git a/src/fonts/SkFontMgr_fontconfig.cpp b/src/fonts/SkFontMgr_fontconfig.cpp
index 0873aa105b..72a5a618a8 100644
--- a/src/fonts/SkFontMgr_fontconfig.cpp
+++ b/src/fonts/SkFontMgr_fontconfig.cpp
@@ -180,7 +180,7 @@ static SkFontStyle make_fontconfig_style(FcPattern* match) {
SkFontStyleSet_FC::SkFontStyleSet_FC(FcPattern** matches, int count) {
fRecCount = count;
- fRecs = SkNEW_ARRAY(Rec, count);
+ fRecs = new Rec[count];
for (int i = 0; i < count; ++i) {
fRecs[i].fStyleName.set(get_name(matches[i], FC_STYLE));
fRecs[i].fFileName.set(get_name(matches[i], FC_FILE));
@@ -188,9 +188,7 @@ SkFontStyleSet_FC::SkFontStyleSet_FC(FcPattern** matches, int count) {
}
}
-SkFontStyleSet_FC::~SkFontStyleSet_FC() {
- SkDELETE_ARRAY(fRecs);
-}
+SkFontStyleSet_FC::~SkFontStyleSet_FC() { delete[] fRecs; }
void SkFontStyleSet_FC::getStyle(int index, SkFontStyle* style,
SkString* styleName) {
@@ -277,9 +275,8 @@ protected:
}
}
- SkFontStyleSet_FC* sset = SkNEW_ARGS(SkFontStyleSet_FC,
- (trimmedMatches.begin(),
- trimmedMatches.count()));
+ SkFontStyleSet_FC* sset =
+ new SkFontStyleSet_FC(trimmedMatches.begin(), trimmedMatches.count());
return sset;
}
@@ -330,5 +327,5 @@ protected:
SkFontMgr* SkFontMgr::Factory() {
SkFontConfigInterface* fci = RefFCI();
- return fci ? SkNEW_ARGS(SkFontMgr_fontconfig, (fci)) : NULL;
+ return fci ? new SkFontMgr_fontconfig(fci) : NULL;
}