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

Unified Diff: src/ports/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/ports/SkFontMgr_custom.cpp ('k') | src/ports/SkFontMgr_win_dw.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/ports/SkFontMgr_fontconfig.cpp
diff --git a/src/ports/SkFontMgr_fontconfig.cpp b/src/ports/SkFontMgr_fontconfig.cpp
index 5a344555464756a387c8b32a65202fe5c4794923..3dc1ea03da76a3935f5819352a1302b6332e9307 100644
--- a/src/ports/SkFontMgr_fontconfig.cpp
+++ b/src/ports/SkFontMgr_fontconfig.cpp
@@ -65,8 +65,8 @@ namespace {
SK_DECLARE_STATIC_MUTEX(gFCMutex);
#ifdef SK_DEBUG
- void *CreateThreadFcLocked() { return SkNEW_ARGS(bool, (false)); }
- void DeleteThreadFcLocked(void* v) { SkDELETE(static_cast<bool*>(v)); }
+void* CreateThreadFcLocked() { return new bool(false); }
+void DeleteThreadFcLocked(void* v) { delete static_cast<bool*>(v); }
# define THREAD_FC_LOCKED \
static_cast<bool*>(SkTLS::Get(CreateThreadFcLocked, DeleteThreadFcLocked))
#endif
@@ -416,7 +416,7 @@ class SkTypeface_fontconfig : public SkTypeface_FreeType {
public:
/** @param pattern takes ownership of the reference. */
static SkTypeface_fontconfig* Create(FcPattern* pattern) {
- return SkNEW_ARGS(SkTypeface_fontconfig, (pattern));
+ return new SkTypeface_fontconfig(pattern);
}
mutable SkAutoFcPattern fPattern;
@@ -725,7 +725,7 @@ protected:
}
}
- return SkNEW_ARGS(StyleSet, (this, matches.detach()));
+ return new StyleSet(this, matches.detach());
}
virtual SkTypeface* onMatchFamilyStyle(const char familyName[],
@@ -830,12 +830,12 @@ protected:
return NULL;
}
- return SkNEW_ARGS(SkTypeface_stream, (new SkFontData(stream.detach(), ttcIndex, NULL, 0),
- style, isFixedWidth));
+ return new SkTypeface_stream(new SkFontData(stream.detach(), ttcIndex, NULL, 0), style,
+ isFixedWidth);
}
SkTypeface* onCreateFromData(SkData* data, int ttcIndex) const override {
- return this->createFromStream(SkNEW_ARGS(SkMemoryStream, (data)), ttcIndex);
+ return this->createFromStream(new SkMemoryStream(data), ttcIndex);
}
SkTypeface* onCreateFromFile(const char path[], int ttcIndex) const override {
@@ -856,7 +856,7 @@ protected:
return NULL;
}
- return SkNEW_ARGS(SkTypeface_stream, (fontData, style, isFixedWidth));
+ return new SkTypeface_stream(fontData, style, isFixedWidth);
}
virtual SkTypeface* onLegacyCreateTypeface(const char familyName[],
« no previous file with comments | « src/ports/SkFontMgr_custom.cpp ('k') | src/ports/SkFontMgr_win_dw.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698