summaryrefslogtreecommitdiff
path: root/core/src/fxge/android
diff options
context:
space:
mode:
Diffstat (limited to 'core/src/fxge/android')
-rw-r--r--core/src/fxge/android/fpf_skiafontmgr.cpp4
-rw-r--r--core/src/fxge/android/fpf_skiamodule.cpp4
-rw-r--r--core/src/fxge/android/fx_android_imp.cpp2
3 files changed, 5 insertions, 5 deletions
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;
}
diff --git a/core/src/fxge/android/fpf_skiamodule.cpp b/core/src/fxge/android/fpf_skiamodule.cpp
index 98036a110a..a421a0e944 100644
--- a/core/src/fxge/android/fpf_skiamodule.cpp
+++ b/core/src/fxge/android/fpf_skiamodule.cpp
@@ -11,7 +11,7 @@
static IFPF_DeviceModule* gs_pPFModule = NULL;
IFPF_DeviceModule* FPF_GetDeviceModule() {
if (!gs_pPFModule) {
- gs_pPFModule = FX_NEW CFPF_SkiaDeviceModule;
+ gs_pPFModule = new CFPF_SkiaDeviceModule;
}
return gs_pPFModule;
}
@@ -24,7 +24,7 @@ void CFPF_SkiaDeviceModule::Destroy() {
}
IFPF_FontMgr* CFPF_SkiaDeviceModule::GetFontMgr() {
if (!m_pFontMgr) {
- m_pFontMgr = FX_NEW CFPF_SkiaFontMgr;
+ m_pFontMgr = new CFPF_SkiaFontMgr;
if (!m_pFontMgr) {
return NULL;
}
diff --git a/core/src/fxge/android/fx_android_imp.cpp b/core/src/fxge/android/fx_android_imp.cpp
index 1927358983..43fe3b197f 100644
--- a/core/src/fxge/android/fx_android_imp.cpp
+++ b/core/src/fxge/android/fx_android_imp.cpp
@@ -13,7 +13,7 @@ void CFX_GEModule::InitPlatform() {
}
IFPF_FontMgr* pFontMgr = pDeviceModule->GetFontMgr();
if (pFontMgr) {
- CFX_AndroidFontInfo* pFontInfo = FX_NEW CFX_AndroidFontInfo;
+ CFX_AndroidFontInfo* pFontInfo = new CFX_AndroidFontInfo;
if (!pFontInfo) {
return;
}