From ae51c810a44844ef437393c1768be8f7766586b2 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Wed, 5 Aug 2015 12:34:06 -0700 Subject: Kill off last uses of FX_NEW in XFA. It would seem that this never merged completely. R=thestig@chromium.org Review URL: https://codereview.chromium.org/1277583002 . --- core/src/fxge/android/fpf_skiafontmgr.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'core/src/fxge/android/fpf_skiafontmgr.cpp') diff --git a/core/src/fxge/android/fpf_skiafontmgr.cpp b/core/src/fxge/android/fpf_skiafontmgr.cpp index 59fbcb5f58..303ba97709 100644 --- a/core/src/fxge/android/fpf_skiafontmgr.cpp +++ b/core/src/fxge/android/fpf_skiafontmgr.cpp @@ -332,7 +332,7 @@ IFPF_Font* CFPF_SkiaFontMgr::CreateFont(const CFX_ByteStringC& bsFamilyname, CFPF_SkiaFontDescriptor* pFontDes = (CFPF_SkiaFontDescriptor*)m_FontFaces.ElementAt(nItem); <<<<<<< HEAD - CFPF_SkiaFont* pFont = FX_NEW CFPF_SkiaFont; + CFPF_SkiaFont* pFont = new CFPF_SkiaFont; if (pFont) { if (pFont->InitFont(this, pFontDes, bsFamilyname, dwStyle, uCharset)) { m_FamilyFonts.SetAt((void*)(uintptr_t)dwHash, (void*)pFont); @@ -449,7 +449,7 @@ void CFPF_SkiaFontMgr::ScanPath(const CFX_ByteStringC& path) { void CFPF_SkiaFontMgr::ScanFile(const CFX_ByteStringC& file) { FXFT_Face face = GetFontFace(file); if (face) { - CFPF_SkiaPathFont* pFontDesc = FX_NEW CFPF_SkiaPathFont; + CFPF_SkiaPathFont* pFontDesc = new CFPF_SkiaPathFont; if (!pFontDesc) { return; } -- cgit v1.2.3