summaryrefslogtreecommitdiff
path: root/core/src/fxge/ge
diff options
context:
space:
mode:
authorTom Sepez <tsepez@chromium.org>2015-08-05 12:34:06 -0700
committerTom Sepez <tsepez@chromium.org>2015-08-05 12:34:06 -0700
commitae51c810a44844ef437393c1768be8f7766586b2 (patch)
tree373bbfa8c8720af43d58a9982beea3ebf10c5d6d /core/src/fxge/ge
parente3166a8c39c8943f6cafb2ffe10bd9564e3eaf16 (diff)
downloadpdfium-ae51c810a44844ef437393c1768be8f7766586b2.tar.xz
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 .
Diffstat (limited to 'core/src/fxge/ge')
-rw-r--r--core/src/fxge/ge/fx_ge.cpp6
-rw-r--r--core/src/fxge/ge/fx_ge_font.cpp8
-rw-r--r--core/src/fxge/ge/fx_ge_fontmap.cpp6
-rw-r--r--core/src/fxge/ge/fx_ge_linux.cpp2
-rw-r--r--core/src/fxge/ge/fx_ge_ps.cpp2
-rw-r--r--core/src/fxge/ge/fx_ge_text.cpp6
6 files changed, 15 insertions, 15 deletions
diff --git a/core/src/fxge/ge/fx_ge.cpp b/core/src/fxge/ge/fx_ge.cpp
index b92e1ba773..607c9ee559 100644
--- a/core/src/fxge/ge/fx_ge.cpp
+++ b/core/src/fxge/ge/fx_ge.cpp
@@ -25,11 +25,11 @@ CFX_GEModule* CFX_GEModule::Get() {
return g_pGEModule;
}
void CFX_GEModule::Create() {
- g_pGEModule = FX_NEW CFX_GEModule;
+ g_pGEModule = new CFX_GEModule;
if (!g_pGEModule) {
return;
}
- g_pGEModule->m_pFontMgr = FX_NEW CFX_FontMgr;
+ g_pGEModule->m_pFontMgr = new CFX_FontMgr;
g_pGEModule->InitPlatform();
g_pGEModule->SetTextGamma(2.2f);
}
@@ -42,7 +42,7 @@ void CFX_GEModule::Destroy() {
}
CFX_FontCache* CFX_GEModule::GetFontCache() {
if (m_pFontCache == NULL) {
- m_pFontCache = FX_NEW CFX_FontCache();
+ m_pFontCache = new CFX_FontCache();
}
return m_pFontCache;
}
diff --git a/core/src/fxge/ge/fx_ge_font.cpp b/core/src/fxge/ge/fx_ge_font.cpp
index 36bbec0498..d428494913 100644
--- a/core/src/fxge/ge/fx_ge_font.cpp
+++ b/core/src/fxge/ge/fx_ge_font.cpp
@@ -34,7 +34,7 @@ FX_BOOL CFX_Font::LoadClone(const CFX_Font* pFont) {
}
m_bLogic = TRUE;
if (pFont->m_pSubstFont) {
- m_pSubstFont = FX_NEW CFX_SubstFont;
+ m_pSubstFont = new CFX_SubstFont;
if (!m_pSubstFont) {
return FALSE;
}
@@ -102,7 +102,7 @@ FX_BOOL CFX_Font::LoadSubst(const CFX_ByteString& face_name,
FX_BOOL bVertical) {
m_bEmbedded = FALSE;
m_bVertical = bVertical;
- m_pSubstFont = FX_NEW CFX_SubstFont;
+ m_pSubstFont = new CFX_SubstFont;
if (!m_pSubstFont) {
return FALSE;
}
@@ -468,7 +468,7 @@ FX_DWORD CFX_UnicodeEncoding::GlyphFromCharCodeEx(FX_DWORD charcode,
}
IFX_FontEncoding* FXGE_CreateUnicodeEncoding(CFX_Font* pFont) {
CFX_UnicodeEncoding* pEncoding = NULL;
- pEncoding = FX_NEW CFX_UnicodeEncoding(pFont);
+ pEncoding = new CFX_UnicodeEncoding(pFont);
return pEncoding;
}
CFX_FontEncodingEX::CFX_FontEncodingEX() {
@@ -603,7 +603,7 @@ static IFX_FontEncodingEx* _FXFM_CreateFontEncoding(CFX_Font* pFont,
if (error) {
return NULL;
}
- CFX_FontEncodingEX* pFontEncoding = FX_NEW CFX_FontEncodingEX;
+ CFX_FontEncodingEX* pFontEncoding = new CFX_FontEncodingEX;
if (pFontEncoding && !pFontEncoding->Init(pFont, nEncodingID)) {
delete pFontEncoding;
pFontEncoding = NULL;
diff --git a/core/src/fxge/ge/fx_ge_fontmap.cpp b/core/src/fxge/ge/fx_ge_fontmap.cpp
index b3f6b7de73..2e591cd986 100644
--- a/core/src/fxge/ge/fx_ge_fontmap.cpp
+++ b/core/src/fxge/ge/fx_ge_fontmap.cpp
@@ -124,7 +124,7 @@ FXFT_Face CFX_FontMgr::AddCachedFace(const CFX_ByteString& face_name,
uint8_t* pData,
FX_DWORD size,
int face_index) {
- CTTFontDesc* pFontDesc = FX_NEW CTTFontDesc;
+ CTTFontDesc* pFontDesc = new CTTFontDesc;
if (!pFontDesc) {
return NULL;
}
@@ -330,7 +330,7 @@ FXFT_Face CFX_FontMgr::AddCachedTTCFace(int ttc_size,
int font_offset) {
CFX_ByteString key;
key.Format("%d:%d", ttc_size, checksum);
- CTTFontDesc* pFontDesc = FX_NEW CTTFontDesc;
+ CTTFontDesc* pFontDesc = new CTTFontDesc;
if (!pFontDesc) {
return NULL;
}
@@ -1493,7 +1493,7 @@ void CFX_FolderFontInfo::ReportFace(CFX_ByteString& path,
if (m_FontList.Lookup(facename, p)) {
return;
}
- CFontFaceInfo* pInfo = FX_NEW CFontFaceInfo;
+ CFontFaceInfo* pInfo = new CFontFaceInfo;
if (!pInfo) {
return;
}
diff --git a/core/src/fxge/ge/fx_ge_linux.cpp b/core/src/fxge/ge/fx_ge_linux.cpp
index c194adf3a1..cb8a0add76 100644
--- a/core/src/fxge/ge/fx_ge_linux.cpp
+++ b/core/src/fxge/ge/fx_ge_linux.cpp
@@ -228,7 +228,7 @@ void* CFX_LinuxFontInfo::FindFont(int weight,
return pFind;
}
IFX_SystemFontInfo* IFX_SystemFontInfo::CreateDefault() {
- CFX_LinuxFontInfo* pInfo = FX_NEW CFX_LinuxFontInfo;
+ CFX_LinuxFontInfo* pInfo = new CFX_LinuxFontInfo;
if (!pInfo) {
return NULL;
}
diff --git a/core/src/fxge/ge/fx_ge_ps.cpp b/core/src/fxge/ge/fx_ge_ps.cpp
index 2e3af36527..5a97d5b18b 100644
--- a/core/src/fxge/ge/fx_ge_ps.cpp
+++ b/core/src/fxge/ge/fx_ge_ps.cpp
@@ -572,7 +572,7 @@ void CFX_PSRenderer::FindPSFontGlyph(CFX_FaceCache* pFaceCache,
}
if (m_PSFontList.GetSize() == 0 ||
m_PSFontList[m_PSFontList.GetSize() - 1]->m_nGlyphs == 256) {
- CPSFont* pPSFont = FX_NEW CPSFont;
+ CPSFont* pPSFont = new CPSFont;
if (!pPSFont) {
return;
}
diff --git a/core/src/fxge/ge/fx_ge_text.cpp b/core/src/fxge/ge/fx_ge_text.cpp
index 5535eb247c..124ee7d88d 100644
--- a/core/src/fxge/ge/fx_ge_text.cpp
+++ b/core/src/fxge/ge/fx_ge_text.cpp
@@ -1226,7 +1226,7 @@ CFX_GlyphBitmap* CFX_FaceCache::LookUpGlyphBitmap(
int anti_alias) {
CFX_SizeGlyphCache* pSizeCache = NULL;
if (!m_SizeMap.Lookup(FaceGlyphsKey, (void*&)pSizeCache)) {
- pSizeCache = FX_NEW CFX_SizeGlyphCache;
+ pSizeCache = new CFX_SizeGlyphCache;
if (pSizeCache == NULL) {
return NULL;
}
@@ -1571,7 +1571,7 @@ CFX_GlyphBitmap* CFX_FaceCache::RenderGlyph(CFX_Font* pFont,
return NULL;
}
int dib_width = bmwidth;
- CFX_GlyphBitmap* pGlyphBitmap = FX_NEW CFX_GlyphBitmap;
+ CFX_GlyphBitmap* pGlyphBitmap = new CFX_GlyphBitmap;
if (!pGlyphBitmap) {
return NULL;
}
@@ -1923,7 +1923,7 @@ CFX_PathData* CFX_Font::LoadGlyphPath(FX_DWORD glyph_index, int dest_width) {
if (params.m_PointCount == 0) {
return NULL;
}
- CFX_PathData* pPath = FX_NEW CFX_PathData;
+ CFX_PathData* pPath = new CFX_PathData;
if (!pPath) {
return NULL;
}