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

Unified Diff: src/ports/SkFontMgr_custom.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/ports/SkFontMgr_android.cpp ('k') | src/ports/SkFontMgr_fontconfig.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/ports/SkFontMgr_custom.cpp
diff --git a/src/ports/SkFontMgr_custom.cpp b/src/ports/SkFontMgr_custom.cpp
index 835acd786fe2553ccf34b2bc5b726a9823b0f84c..496a54cd3831befc952e751706787bb88a0bd576 100644
--- a/src/ports/SkFontMgr_custom.cpp
+++ b/src/ports/SkFontMgr_custom.cpp
@@ -296,8 +296,8 @@ protected:
SkFontStyle style;
SkString name;
if (fScanner.scanFont(stream, ttcIndex, &name, &style, &isFixedPitch, NULL)) {
- return SkNEW_ARGS(SkTypeface_Stream, (style, isFixedPitch, false, name,
- stream.detach(), ttcIndex));
+ return new SkTypeface_Stream(style, isFixedPitch, false, name, stream.detach(),
+ ttcIndex);
} else {
return NULL;
}
@@ -353,7 +353,7 @@ public:
if (families->empty()) {
SkFontStyleSet_Custom* family = new SkFontStyleSet_Custom(SkString());
families->push_back().reset(family);
- family->appendTypeface(SkNEW(SkTypeface_Empty));
+ family->appendTypeface(new SkTypeface_Empty);
}
}
@@ -400,13 +400,9 @@ private:
continue;
}
- SkTypeface_Custom* tf = SkNEW_ARGS(SkTypeface_File, (
- style,
- isFixedPitch,
- true, // system-font (cannot delete)
- realname,
- filename.c_str(),
- faceIndex));
+ SkTypeface_Custom* tf = new SkTypeface_File(style, isFixedPitch,
+ true, // system-font (cannot delete)
+ realname, filename.c_str(), faceIndex);
SkFontStyleSet_Custom* addTo = find_family(*families, realname.c_str());
if (NULL == addTo) {
@@ -454,7 +450,7 @@ public:
if (families->empty()) {
SkFontStyleSet_Custom* family = new SkFontStyleSet_Custom(SkString());
families->push_back().reset(family);
- family->appendTypeface(SkNEW(SkTypeface_Empty));
+ family->appendTypeface(new SkTypeface_Empty);
}
}
@@ -491,13 +487,9 @@ private:
return;
}
- SkTypeface_Custom* tf = SkNEW_ARGS(SkTypeface_Stream, (
- style,
- isFixedPitch,
- true, // system-font (cannot delete)
- realname,
- stream.detach(),
- faceIndex));
+ SkTypeface_Custom* tf =
+ new SkTypeface_Stream(style, isFixedPitch, true, // system-font (cannot delete)
+ realname, stream.detach(), faceIndex);
SkFontStyleSet_Custom* addTo = find_family(*families, realname.c_str());
if (NULL == addTo) {
« no previous file with comments | « src/ports/SkFontMgr_android.cpp ('k') | src/ports/SkFontMgr_fontconfig.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698