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 .

4 files changed, 9 insertions, 9 deletions

diff --git a/fpdfsdk/src/fpdfxfa/fpdfxfa_app.cpp b/fpdfsdk/src/fpdfxfa/fpdfxfa_app.cpp
index a53381876a..5a233aa92a 100644
--- a/fpdfsdk/src/fpdfxfa/fpdfxfa_app.cpp
+++ b/fpdfsdk/src/fpdfxfa/fpdfxfa_app.cpp
@@ -17,7 +17,7 @@ CPDFXFA_App* CPDFXFA_App::g_pApp = NULL;
 

 CPDFXFA_App* CPDFXFA_App::GetInstance() {

   if (!g_pApp) {

-    g_pApp = FX_NEW CPDFXFA_App();

+    g_pApp = new CPDFXFA_App();

   }

   return g_pApp;

 }

@@ -551,6 +551,6 @@ IFWL_AdapterTimerMgr* CPDFXFA_App::GetTimerMgr() {
   CXFA_FWLAdapterTimerMgr* pAdapter = NULL;

   CPDFDoc_Environment* pEnv = m_pEnvList.GetAt(0);

   if (pEnv)

-    pAdapter = FX_NEW CXFA_FWLAdapterTimerMgr(pEnv);

+    pAdapter = new CXFA_FWLAdapterTimerMgr(pEnv);

   return pAdapter;

 }

diff --git a/fpdfsdk/src/fpdfxfa/fpdfxfa_doc.cpp b/fpdfsdk/src/fpdfxfa/fpdfxfa_doc.cpp
index 30be57e763..be3b235889 100644
--- a/fpdfsdk/src/fpdfxfa/fpdfxfa_doc.cpp
+++ b/fpdfsdk/src/fpdfxfa/fpdfxfa_doc.cpp
@@ -159,7 +159,7 @@ CPDFXFA_Page* CPDFXFA_Document::GetPage(int page_index) {
   }

 

   if (!pPage) {

-    pPage = FX_NEW CPDFXFA_Page(this, page_index);

+    pPage = new CPDFXFA_Page(this, page_index);

     FX_BOOL bRet = pPage->LoadPage();

     if (!bRet) {

       delete pPage;

@@ -649,7 +649,7 @@ void CPDFXFA_Document::SetTitle(IXFA_Doc* hDoc,
 

   if (pInfoDict == NULL)

     return;

-  pInfoDict->SetAt("Title", FX_NEW CPDF_String(wsTitle));

+  pInfoDict->SetAt("Title", new CPDF_String(wsTitle));

 }

 void CPDFXFA_Document::ExportData(IXFA_Doc* hDoc,

                                   const CFX_WideStringC& wsFilePath,

@@ -767,7 +767,7 @@ content.GetLength());
         }

 

         CPDF_Stream* pStream = (CPDF_Stream*)pDirectObj;

-        CPDF_StreamAcc* pAcc = FX_NEW CPDF_StreamAcc;

+        CPDF_StreamAcc* pAcc = new CPDF_StreamAcc;

         pAcc->LoadAllData(pStream);

         fileWrite.WriteBlock(pAcc->GetData(), fileWrite.GetSize(),

                              pAcc->GetSize());

@@ -998,7 +998,7 @@ IFX_FileRead* CPDFXFA_Document::OpenLinkedFile(IXFA_Doc* hDoc,
 

   if (pFileHandler == NULL)

     return NULL;

-  CFPDF_FileStream* pFileRead = FX_NEW CFPDF_FileStream(pFileHandler);

+  CFPDF_FileStream* pFileRead = new CFPDF_FileStream(pFileHandler);

   return pFileRead;

 }

 FX_BOOL CPDFXFA_Document::_ExportSubmitFile(FPDF_FILEHANDLER* pFileHandler,

diff --git a/fpdfsdk/src/fpdfxfa/fpdfxfa_page.cpp b/fpdfsdk/src/fpdfxfa/fpdfxfa_page.cpp
index f8fbbd4997..3197f2a5e7 100644
--- a/fpdfsdk/src/fpdfxfa/fpdfxfa_page.cpp
+++ b/fpdfsdk/src/fpdfxfa/fpdfxfa_page.cpp
@@ -51,7 +51,7 @@ FX_BOOL CPDFXFA_Page::LoadPDFPage() {
       m_pPDFPage = NULL;

     }

 

-    m_pPDFPage = FX_NEW CPDF_Page;

+    m_pPDFPage = new CPDF_Page;

     m_pPDFPage->Load(pPDFDoc, pDict);

     m_pPDFPage->ParseContent();

     return TRUE;

@@ -113,7 +113,7 @@ FX_BOOL CPDFXFA_Page::LoadPDFPage(CPDF_Dictionary* pageDict) {
   if (m_pPDFPage)

     delete m_pPDFPage;

 

-  m_pPDFPage = FX_NEW CPDF_Page();

+  m_pPDFPage = new CPDF_Page();

   m_pPDFPage->Load(m_pDocument->GetPDFDoc(), pageDict);

   m_pPDFPage->ParseContent();

 

diff --git a/fpdfsdk/src/fpdfxfa/fpdfxfa_util.cpp b/fpdfsdk/src/fpdfxfa/fpdfxfa_util.cpp
index 3e1eedf8ea..9db36c3920 100644
--- a/fpdfsdk/src/fpdfxfa/fpdfxfa_util.cpp
+++ b/fpdfsdk/src/fpdfxfa/fpdfxfa_util.cpp
@@ -16,7 +16,7 @@ FWL_ERR CXFA_FWLAdapterTimerMgr::Start(IFWL_Timer* pTimer,
                                        FX_BOOL bImmediately /* = TRUE */) {

   if (m_pEnv) {

     uint32_t uIDEvent = m_pEnv->FFI_SetTimer(dwElapse, TimerProc);

-    CFWL_TimerInfo* pInfo = FX_NEW CFWL_TimerInfo;

+    CFWL_TimerInfo* pInfo = new CFWL_TimerInfo;

     pInfo->uIDEvent = uIDEvent;

     pInfo->pTimer = pTimer;

     ms_timerArray.Add(pInfo);