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

Unified Diff: src/ports/SkFontHost_win.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/SkFontHost_mac.cpp ('k') | src/ports/SkFontMgr_android.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/ports/SkFontHost_win.cpp
diff --git a/src/ports/SkFontHost_win.cpp b/src/ports/SkFontHost_win.cpp
old mode 100755
new mode 100644
index d19ab1adba5cfdf8c49bee85da3e7aa86d94c8e2..97e659ef6f5592cf137521c654aa9840a0f32711
--- a/src/ports/SkFontHost_win.cpp
+++ b/src/ports/SkFontHost_win.cpp
@@ -2277,10 +2277,9 @@ size_t LogFontTypeface::onGetTableData(SkFontTableTag tag, size_t offset,
}
SkScalerContext* LogFontTypeface::onCreateScalerContext(const SkDescriptor* desc) const {
- SkScalerContext_GDI* ctx = SkNEW_ARGS(SkScalerContext_GDI,
- (const_cast<LogFontTypeface*>(this), desc));
+ SkScalerContext_GDI* ctx = new SkScalerContext_GDI(const_cast<LogFontTypeface*>(this), desc);
if (!ctx->isValid()) {
- SkDELETE(ctx);
+ delete ctx;
ctx = NULL;
}
return ctx;
@@ -2442,7 +2441,7 @@ protected:
SkFontStyleSet* onCreateStyleSet(int index) const override {
SkASSERT((unsigned)index < (unsigned)fLogFontArray.count());
- return SkNEW_ARGS(SkFontStyleSetGDI, (fLogFontArray[index].elfLogFont.lfFaceName));
+ return new SkFontStyleSetGDI(fLogFontArray[index].elfLogFont.lfFaceName);
}
SkFontStyleSet* onMatchFamily(const char familyName[]) const override {
@@ -2451,7 +2450,7 @@ protected:
}
LOGFONT lf;
logfont_for_name(familyName, &lf);
- return SkNEW_ARGS(SkFontStyleSetGDI, (lf.lfFaceName));
+ return new SkFontStyleSetGDI(lf.lfFaceName);
}
virtual SkTypeface* onMatchFamilyStyle(const char familyName[],
@@ -2482,7 +2481,7 @@ protected:
SkTypeface* onCreateFromData(SkData* data, int ttcIndex) const override {
// could be in base impl
- return this->createFromStream(SkNEW_ARGS(SkMemoryStream, (data)));
+ return this->createFromStream(new SkMemoryStream(data));
}
SkTypeface* onCreateFromFile(const char path[], int ttcIndex) const override {
@@ -2511,6 +2510,4 @@ private:
///////////////////////////////////////////////////////////////////////////////
-SkFontMgr* SkFontMgr_New_GDI() {
- return SkNEW(SkFontMgrGDI);
-}
+SkFontMgr* SkFontMgr_New_GDI() { return new SkFontMgrGDI; }
« no previous file with comments | « src/ports/SkFontHost_mac.cpp ('k') | src/ports/SkFontMgr_android.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698