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 .

5 files changed, 17 insertions, 17 deletions

diff --git a/core/src/fxge/win32/fx_win32_device.cpp b/core/src/fxge/win32/fx_win32_device.cpp
index d0d13b1018..295a6e94ca 100644
--- a/core/src/fxge/win32/fx_win32_device.cpp
+++ b/core/src/fxge/win32/fx_win32_device.cpp
@@ -405,7 +405,7 @@ IFX_SystemFontInfo* IFX_SystemFontInfo::CreateDefault() {
   return new CFX_Win32FontInfo;
 }
 void CFX_GEModule::InitPlatform() {
-  CWin32Platform* pPlatformData = FX_NEW CWin32Platform;
+  CWin32Platform* pPlatformData = new CWin32Platform;
   if (!pPlatformData) {
     return;
   }
@@ -1251,7 +1251,7 @@ CFX_WindowsDevice::CFX_WindowsDevice(HDC hDC,
   m_bForcePSOutput = bForcePSOutput;
   m_psLevel = psLevel;
   if (bForcePSOutput) {
-    IFX_RenderDeviceDriver* pDriver = FX_NEW CPSPrinterDriver;
+    IFX_RenderDeviceDriver* pDriver = new CPSPrinterDriver;
     if (!pDriver) {
       return;
     }
@@ -1280,9 +1280,9 @@ IFX_RenderDeviceDriver* CFX_WindowsDevice::CreateDriver(HDC hDC,
     device_class = FXDC_DISPLAY;
   }
   if (device_class == FXDC_PRINTER) {
-    return FX_NEW CGdiPrinterDriver(hDC);
+    return new CGdiPrinterDriver(hDC);
   }
-  return FX_NEW CGdiDisplayDriver(hDC);
+  return new CGdiDisplayDriver(hDC);
 }
 CFX_WinBitmapDevice::CFX_WinBitmapDevice(int width,
                                          int height,
@@ -1300,7 +1300,7 @@ CFX_WinBitmapDevice::CFX_WinBitmapDevice(int width,
   if (m_hBitmap == NULL) {
     return;
   }
-  CFX_DIBitmap* pBitmap = FX_NEW CFX_DIBitmap;
+  CFX_DIBitmap* pBitmap = new CFX_DIBitmap;
   if (!pBitmap) {
     return;
   }
@@ -1308,7 +1308,7 @@ CFX_WinBitmapDevice::CFX_WinBitmapDevice(int width,
   SetBitmap(pBitmap);
   m_hDC = ::CreateCompatibleDC(NULL);
   m_hOldBitmap = (HBITMAP)SelectObject(m_hDC, m_hBitmap);
-  IFX_RenderDeviceDriver* pDriver = FX_NEW CGdiDisplayDriver(m_hDC);
+  IFX_RenderDeviceDriver* pDriver = new CGdiDisplayDriver(m_hDC);
   if (!pDriver) {
     return;
   }
diff --git a/core/src/fxge/win32/fx_win32_dib.cpp b/core/src/fxge/win32/fx_win32_dib.cpp
index d7dd912d14..f6230f6ce0 100644
--- a/core/src/fxge/win32/fx_win32_dib.cpp
+++ b/core/src/fxge/win32/fx_win32_dib.cpp
@@ -59,7 +59,7 @@ CFX_DIBitmap* _FX_WindowsDIB_LoadFromBuf(BITMAPINFO* pbmi,
     bBottomUp = FALSE;
   }
   int pitch = (width * pbmi->bmiHeader.biBitCount + 31) / 32 * 4;
-  CFX_DIBitmap* pBitmap = FX_NEW CFX_DIBitmap;
+  CFX_DIBitmap* pBitmap = new CFX_DIBitmap;
   if (!pBitmap) {
     return NULL;
   }
@@ -131,7 +131,7 @@ CFX_DIBitmap* CFX_WindowsDIB::LoadFromFile(const FX_WCHAR* filename) {
   HDC hDC = CreateCompatibleDC(NULL);
   int width, height;
   GetBitmapSize(hBitmap, width, height);
-  CFX_DIBitmap* pDIBitmap = FX_NEW CFX_DIBitmap;
+  CFX_DIBitmap* pDIBitmap = new CFX_DIBitmap;
   if (!pDIBitmap) {
     DeleteDC(hDC);
     return NULL;
@@ -168,7 +168,7 @@ CFX_DIBitmap* CFX_WindowsDIB::LoadDIBitmap(WINDIB_Open_Args_ args) {
   HDC hDC = CreateCompatibleDC(NULL);
   int width, height;
   GetBitmapSize(hBitmap, width, height);
-  CFX_DIBitmap* pDIBitmap = FX_NEW CFX_DIBitmap;
+  CFX_DIBitmap* pDIBitmap = new CFX_DIBitmap;
   if (!pDIBitmap) {
     DeleteDC(hDC);
     return NULL;
@@ -204,7 +204,7 @@ CFX_DIBitmap* CFX_WindowsDIB::LoadFromDDB(HDC hDC,
   int height = abs(bmih.biHeight);
   bmih.biHeight = -height;
   bmih.biCompression = BI_RGB;
-  CFX_DIBitmap* pDIBitmap = FX_NEW CFX_DIBitmap;
+  CFX_DIBitmap* pDIBitmap = new CFX_DIBitmap;
   if (!pDIBitmap) {
     return NULL;
   }
diff --git a/core/src/fxge/win32/fx_win32_dwrite.cpp b/core/src/fxge/win32/fx_win32_dwrite.cpp
index cf54e0ccaa..f4f6d91fbc 100644
--- a/core/src/fxge/win32/fx_win32_dwrite.cpp
+++ b/core/src/fxge/win32/fx_win32_dwrite.cpp
@@ -63,7 +63,7 @@ class CDwFontFileLoader final : public IDWriteFontFileLoader {
 
   static IDWriteFontFileLoader* GetLoader() {
     if (instance_ == NULL) {
-      instance_ = FX_NEW CDwFontFileLoader();
+      instance_ = new CDwFontFileLoader();
       return instance_;
     }
     return instance_;
@@ -190,7 +190,7 @@ FX_BOOL CDWriteExt::DwCreateRenderingTarget(CFX_DIBitmap* pBitmap,
     goto failed;
   }
   *(CDwGdiTextRenderer**)renderTarget =
-      FX_NEW CDwGdiTextRenderer(pBitmap, pBitmapRenderTarget, pRenderingParams);
+      new CDwGdiTextRenderer(pBitmap, pBitmapRenderTarget, pRenderingParams);
   if (*(CDwGdiTextRenderer**)renderTarget == NULL) {
     goto failed;
   }
@@ -336,7 +336,7 @@ HRESULT STDMETHODCALLTYPE CDwFontFileLoader::CreateStreamFromKey(
     OUT IDWriteFontFileStream** fontFileStream) {
   *fontFileStream = NULL;
   CDwFontFileStream* stream =
-      FX_NEW CDwFontFileStream(fontFileReferenceKey, fontFileReferenceKeySize);
+      new CDwFontFileStream(fontFileReferenceKey, fontFileReferenceKeySize);
   if (stream == NULL) {
     return E_OUTOFMEMORY;
   }
diff --git a/core/src/fxge/win32/fx_win32_gdipext.cpp b/core/src/fxge/win32/fx_win32_gdipext.cpp
index bfaccc78bd..9dbc7b4289 100644
--- a/core/src/fxge/win32/fx_win32_gdipext.cpp
+++ b/core/src/fxge/win32/fx_win32_gdipext.cpp
@@ -475,7 +475,7 @@ static CFX_DIBitmap* _StretchMonoToGray(int dest_width,
   int result_width = pClipRect->Width();
   int result_height = pClipRect->Height();
   int result_pitch = (result_width + 3) / 4 * 4;
-  CFX_DIBitmap* pStretched = FX_NEW CFX_DIBitmap;
+  CFX_DIBitmap* pStretched = new CFX_DIBitmap;
   if (!pStretched) {
     return NULL;
   }
@@ -1416,7 +1416,7 @@ static PREVIEW3_DIBITMAP* LoadDIBitmap(WINDIB_Open_Args_ args) {
     if (args.memory_size == 0 || !args.memory_base) {
       return NULL;
     }
-    pStream = FX_NEW GpStream;
+    pStream = new GpStream;
     if (!pStream) {
       return NULL;
     }
diff --git a/core/src/fxge/win32/fx_win32_print.cpp b/core/src/fxge/win32/fx_win32_print.cpp
index 1b3ba4eee5..aa8eefd1bb 100644
--- a/core/src/fxge/win32/fx_win32_print.cpp
+++ b/core/src/fxge/win32/fx_win32_print.cpp
@@ -169,7 +169,7 @@ static CFX_DIBitmap* Transform1bppBitmap(const CFX_DIBSource* pSrc,
   CPDF_FixedMatrix result2src_fix(result2src, 8);
   int result_width = result_rect.Width();
   int result_height = result_rect.Height();
-  CFX_DIBitmap* pTempBitmap = FX_NEW CFX_DIBitmap;
+  CFX_DIBitmap* pTempBitmap = new CFX_DIBitmap;
   if (!pTempBitmap) {
     if (pSrcBitmap != src_bitmap) {
       delete pSrcBitmap;
@@ -325,7 +325,7 @@ FX_BOOL CPSPrinterDriver::Init(HDC hDC, int pslevel, FX_BOOL bCmykOutput) {
   m_Width = ::GetDeviceCaps(m_hDC, HORZRES);
   m_Height = ::GetDeviceCaps(m_hDC, VERTRES);
   m_nBitsPerPixel = ::GetDeviceCaps(m_hDC, BITSPIXEL);
-  m_pPSOutput = FX_NEW CPSOutput(hDC);
+  m_pPSOutput = new CPSOutput(hDC);
   if (!m_pPSOutput) {
     return FALSE;
   }