Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(221)

Unified Diff: src/fonts/SkFontMgr_fontconfig.cpp

Issue 1316123003: Style Change: SkNEW->new; SkDELETE->delete (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: 2015-08-26 (Wednesday) 15:59:00 EDT Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp ('k') | src/fonts/SkFontMgr_indirect.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/fonts/SkFontMgr_fontconfig.cpp
diff --git a/src/fonts/SkFontMgr_fontconfig.cpp b/src/fonts/SkFontMgr_fontconfig.cpp
index 0873aa105b5d40c1fb46a2eb29f4faec84b0092f..72a5a618a8cf9cc91346eb9b1e3bb07b65d1e1da 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;
}
« no previous file with comments | « src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp ('k') | src/fonts/SkFontMgr_indirect.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698