summaryrefslogtreecommitdiff
path: root/core/src/fxge/dib
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/dib
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/dib')
-rw-r--r--core/src/fxge/dib/fx_dib_convert.cpp2
-rw-r--r--core/src/fxge/dib/fx_dib_engine.cpp2
-rw-r--r--core/src/fxge/dib/fx_dib_main.cpp22
-rw-r--r--core/src/fxge/dib/fx_dib_transform.cpp4
4 files changed, 15 insertions, 15 deletions
diff --git a/core/src/fxge/dib/fx_dib_convert.cpp b/core/src/fxge/dib/fx_dib_convert.cpp
index 52169b946d..950f72925a 100644
--- a/core/src/fxge/dib/fx_dib_convert.cpp
+++ b/core/src/fxge/dib/fx_dib_convert.cpp
@@ -1105,7 +1105,7 @@ CFX_DIBitmap* CFX_DIBSource::CloneConvert(FXDIB_Format dest_format,
}
return pClone;
}
- CFX_DIBitmap* pClone = FX_NEW CFX_DIBitmap;
+ CFX_DIBitmap* pClone = new CFX_DIBitmap;
if (!pClone) {
return NULL;
}
diff --git a/core/src/fxge/dib/fx_dib_engine.cpp b/core/src/fxge/dib/fx_dib_engine.cpp
index 02e4dbcd42..86d495f28e 100644
--- a/core/src/fxge/dib/fx_dib_engine.cpp
+++ b/core/src/fxge/dib/fx_dib_engine.cpp
@@ -851,7 +851,7 @@ FX_BOOL CFX_ImageStretcher::Continue(IFX_Pause* pPause) {
#define MAX_PROGRESSIVE_STRETCH_PIXELS 1000000
FX_BOOL CFX_ImageStretcher::StartStretch() {
m_pStretchEngine =
- FX_NEW CStretchEngine(m_pDest, m_DestFormat, m_DestWidth, m_DestHeight,
+ new CStretchEngine(m_pDest, m_DestFormat, m_DestWidth, m_DestHeight,
m_ClipRect, m_pSource, m_Flags);
if (!m_pStretchEngine) {
return FALSE;
diff --git a/core/src/fxge/dib/fx_dib_main.cpp b/core/src/fxge/dib/fx_dib_main.cpp
index 2d6d217b46..ce55640cb3 100644
--- a/core/src/fxge/dib/fx_dib_main.cpp
+++ b/core/src/fxge/dib/fx_dib_main.cpp
@@ -161,7 +161,7 @@ CFX_DIBitmap* CFX_DIBSource::Clone(const FX_RECT* pClip) const {
return NULL;
}
}
- CFX_DIBitmap* pNewBitmap = FX_NEW CFX_DIBitmap;
+ CFX_DIBitmap* pNewBitmap = new CFX_DIBitmap;
if (!pNewBitmap) {
return NULL;
}
@@ -226,7 +226,7 @@ FX_BOOL CFX_DIBSource::BuildAlphaMask() {
if (m_pAlphaMask) {
return TRUE;
}
- m_pAlphaMask = FX_NEW CFX_DIBitmap;
+ m_pAlphaMask = new CFX_DIBitmap;
if (!m_pAlphaMask) {
return FALSE;
}
@@ -591,7 +591,7 @@ CFX_DIBitmap* CFX_DIBSource::GetAlphaMask(const FX_RECT* pClip) const {
return NULL;
}
}
- CFX_DIBitmap* pMask = FX_NEW CFX_DIBitmap;
+ CFX_DIBitmap* pMask = new CFX_DIBitmap;
if (!pMask) {
return NULL;
}
@@ -925,7 +925,7 @@ FX_BOOL CFX_DIBitmap::GetGrayData(void* pIccTransform) {
int b = (uint8_t)m_pPalette[i];
gray[i] = (uint8_t)FXRGB2GRAY(r, g, b);
}
- CFX_DIBitmap* pMask = FX_NEW CFX_DIBitmap;
+ CFX_DIBitmap* pMask = new CFX_DIBitmap;
if (!pMask) {
return FALSE;
}
@@ -959,7 +959,7 @@ FX_BOOL CFX_DIBitmap::GetGrayData(void* pIccTransform) {
int b = (uint8_t)m_pPalette[i];
gray[i] = (uint8_t)FXRGB2GRAY(r, g, b);
}
- CFX_DIBitmap* pMask = FX_NEW CFX_DIBitmap;
+ CFX_DIBitmap* pMask = new CFX_DIBitmap;
if (!pMask) {
return FALSE;
}
@@ -979,7 +979,7 @@ FX_BOOL CFX_DIBitmap::GetGrayData(void* pIccTransform) {
break;
}
case FXDIB_Rgb: {
- CFX_DIBitmap* pMask = FX_NEW CFX_DIBitmap;
+ CFX_DIBitmap* pMask = new CFX_DIBitmap;
if (!pMask) {
return FALSE;
}
@@ -1000,7 +1000,7 @@ FX_BOOL CFX_DIBitmap::GetGrayData(void* pIccTransform) {
break;
}
case FXDIB_Rgb32: {
- CFX_DIBitmap* pMask = FX_NEW CFX_DIBitmap;
+ CFX_DIBitmap* pMask = new CFX_DIBitmap;
if (!pMask) {
return FALSE;
}
@@ -1443,7 +1443,7 @@ FX_BOOL CFX_DIBitmap::DitherFS(const FX_DWORD* pPalette,
return TRUE;
}
CFX_DIBitmap* CFX_DIBSource::FlipImage(FX_BOOL bXFlip, FX_BOOL bYFlip) const {
- CFX_DIBitmap* pFlipped = FX_NEW CFX_DIBitmap;
+ CFX_DIBitmap* pFlipped = new CFX_DIBitmap;
if (!pFlipped) {
return NULL;
}
@@ -1521,7 +1521,7 @@ CFX_DIBExtractor::CFX_DIBExtractor(const CFX_DIBSource* pSrc) {
if (pSrc->GetBuffer() == NULL) {
m_pBitmap = pSrc->Clone();
} else {
- m_pBitmap = FX_NEW CFX_DIBitmap;
+ m_pBitmap = new CFX_DIBitmap;
if (!m_pBitmap) {
return;
}
@@ -1644,7 +1644,7 @@ FX_BOOL CFX_ImageRenderer::Start(CFX_DIBitmap* pDevice,
return TRUE;
}
m_Status = 2;
- m_pTransformer = FX_NEW CFX_ImageTransformer;
+ m_pTransformer = new CFX_ImageTransformer;
if (!m_pTransformer) {
return FALSE;
}
@@ -1752,7 +1752,7 @@ FX_BOOL CFX_BitmapStorer::SetInfo(int width,
int height,
FXDIB_Format src_format,
FX_DWORD* pSrcPalette) {
- m_pBitmap = FX_NEW CFX_DIBitmap;
+ m_pBitmap = new CFX_DIBitmap;
if (!m_pBitmap) {
return FALSE;
}
diff --git a/core/src/fxge/dib/fx_dib_transform.cpp b/core/src/fxge/dib/fx_dib_transform.cpp
index 35f8bfe8bc..cbf3bdc82c 100644
--- a/core/src/fxge/dib/fx_dib_transform.cpp
+++ b/core/src/fxge/dib/fx_dib_transform.cpp
@@ -77,7 +77,7 @@ CFX_DIBitmap* CFX_DIBSource::SwapXY(FX_BOOL bXFlip,
if (dest_clip.IsEmpty()) {
return NULL;
}
- CFX_DIBitmap* pTransBitmap = FX_NEW CFX_DIBitmap;
+ CFX_DIBitmap* pTransBitmap = new CFX_DIBitmap;
if (!pTransBitmap) {
return NULL;
}
@@ -422,7 +422,7 @@ FX_BOOL CFX_ImageTransformer::Continue(IFX_Pause* pPause) {
stretch_buf_mask = m_Storer.GetBitmap()->m_pAlphaMask->GetBuffer();
}
int stretch_pitch = m_Storer.GetBitmap()->GetPitch();
- CFX_DIBitmap* pTransformed = FX_NEW CFX_DIBitmap;
+ CFX_DIBitmap* pTransformed = new CFX_DIBitmap;
if (!pTransformed) {
return FALSE;
}