diff options
| author |  halcanary <halcanary@google.com> | 2015-08-26 13:07:48 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-08-26 13:07:49 -0700 |
| commit | 385fe4d4b62d7d1dd76116dd570df3290a2f487b (patch) | |
| tree | 53d982ff238828331e86acd44071a44162a8688c /src/ports/SkFontHost_FreeType.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_FreeType.cpp')
| -rw-r--r-- | src/ports/SkFontHost_FreeType.cpp | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/src/ports/SkFontHost_FreeType.cpp b/src/ports/SkFontHost_FreeType.cpp index 63f598fd13..860f32002c 100644 --- a/src/ports/SkFontHost_FreeType.cpp +++ b/src/ports/SkFontHost_FreeType.cpp @@ -158,7 +158,7 @@ static bool ref_ft_library() { if (0 == gFTCount) { SkASSERT(NULL == gFTLibrary); - gFTLibrary = SkNEW(FreeTypeLibrary); + gFTLibrary = new FreeTypeLibrary; } ++gFTCount; return gFTLibrary->library(); @@ -172,7 +172,7 @@ static void unref_ft_library() { --gFTCount; if (0 == gFTCount) { SkASSERT(NULL != gFTLibrary); - SkDELETE(gFTLibrary); + delete gFTLibrary; SkDEBUGCODE(gFTLibrary = NULL;) } } @@ -319,7 +319,7 @@ static FT_Face ref_ft_face(const SkTypeface* typeface) { } // this passes ownership of stream to the rec - rec = SkNEW_ARGS(SkFaceRec, (data->detachStream(), fontID)); + rec = new SkFaceRec(data->detachStream(), fontID); FT_Open_Args args; memset(&args, 0, sizeof(args)); @@ -336,7 +336,7 @@ static FT_Face ref_ft_face(const SkTypeface* typeface) { FT_Error err = FT_Open_Face(gFTLibrary->library(), &args, data->getIndex(), &rec->fFace); if (err) { SkDEBUGF(("ERROR: unable to open font '%x'\n", fontID)); - SkDELETE(rec); + delete rec; return NULL; } SkASSERT(rec->fFace); @@ -374,7 +374,7 @@ static void unref_ft_face(FT_Face face) { gFaceRecHead = next; } FT_Done_Face(face); - SkDELETE(rec); + delete rec; } return; } @@ -662,11 +662,10 @@ static bool isAxisAligned(const SkScalerContext::Rec& rec) { SkScalerContext* SkTypeface_FreeType::onCreateScalerContext( const SkDescriptor* desc) const { - SkScalerContext_FreeType* c = SkNEW_ARGS(SkScalerContext_FreeType, - (const_cast<SkTypeface_FreeType*>(this), - desc)); + SkScalerContext_FreeType* c = + new SkScalerContext_FreeType(const_cast<SkTypeface_FreeType*>(this), desc); if (!c->success()) { - SkDELETE(c); + delete c; c = NULL; } return c; |