diff options
author | 2015-08-26 13:07:48 -0700 | |
---|---|---|
committer | 2015-08-26 13:07:49 -0700 | |
commit | 385fe4d4b62d7d1dd76116dd570df3290a2f487b (patch) | |
tree | 53d982ff238828331e86acd44071a44162a8688c /src/ports/SkFontHost_win.cpp | |
parent | 5015176adf046ef906a2313b6e6b64b72cc84898 (diff) |
Style Change: SkNEW->new; SkDELETE->delete
DOCS_PREVIEW= https://skia.org/?cl=1316123003
Review URL: https://codereview.chromium.org/1316123003
Diffstat (limited to 'src/ports/SkFontHost_win.cpp')
-rw-r--r--[-rwxr-xr-x] | src/ports/SkFontHost_win.cpp | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/src/ports/SkFontHost_win.cpp b/src/ports/SkFontHost_win.cpp index d19ab1adba..97e659ef6f 100755..100644 --- 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; } |