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 .

7 files changed, 25 insertions, 25 deletions

diff --git a/core/src/fpdfdoc/doc_annot.cpp b/core/src/fpdfdoc/doc_annot.cpp
index e9df5e1d7e..e50e4057be 100644
--- a/core/src/fpdfdoc/doc_annot.cpp
+++ b/core/src/fpdfdoc/doc_annot.cpp
@@ -232,7 +232,7 @@ CPDF_Form* CPDF_Annot::GetAPForm(const CPDF_Page* pPage, AppearanceMode mode) {
   if (m_APMap.Lookup(pStream, (void*&)pForm)) {
     return pForm;
   }
-  pForm = FX_NEW CPDF_Form(m_pList->m_pDocument, pPage->m_pResources, pStream);
+  pForm = new CPDF_Form(m_pList->m_pDocument, pPage->m_pResources, pStream);
   if (pForm == NULL) {
     return NULL;
   }
diff --git a/core/src/fpdfdoc/doc_form.cpp b/core/src/fpdfdoc/doc_form.cpp
index a921d4980a..d25fd27d13 100644
--- a/core/src/fpdfdoc/doc_form.cpp
+++ b/core/src/fpdfdoc/doc_form.cpp
@@ -101,7 +101,7 @@ CFieldTree::_Node* CFieldTree::AddChild(_Node* pParent,
   if (pParent == NULL) {
     return NULL;
   }
-  _Node* pNode = FX_NEW _Node;
+  _Node* pNode = new _Node;
   if (pNode == NULL) {
     return NULL;
   }
@@ -241,7 +241,7 @@ CPDF_InterForm::CPDF_InterForm(CPDF_Document* pDocument, FX_BOOL bGenerateAP)
   m_bGenerateAP = bGenerateAP;
   m_pFormNotify = NULL;
   m_bUpdated = FALSE;
-  m_pFieldTree = FX_NEW CFieldTree;
+  m_pFieldTree = new CFieldTree;
   CPDF_Dictionary* pRoot = m_pDocument->GetRoot();
   m_pFormDict = pRoot->GetDict("AcroForm");
   if (m_pFormDict == NULL) {
@@ -1289,7 +1289,7 @@ CPDF_FormField* CPDF_InterForm::AddTerminalField(
         }
       }
     }
-    pField = FX_NEW CPDF_FormField(this, pParent);
+    pField = new CPDF_FormField(this, pParent);
     CPDF_Object* pTObj = pDict->GetElement("T");
     if (pTObj && pTObj->GetType() == PDFOBJ_REFERENCE) {
       CPDF_Object* pClone = pTObj->Clone(TRUE);
@@ -1327,7 +1327,7 @@ CPDF_FormControl* CPDF_InterForm::AddControl(
   if (m_ControlMap.Lookup((CPDF_Dictionary*)pWidgetDict, rValue)) {
     return (CPDF_FormControl*)rValue;
   }
-  CPDF_FormControl* pControl = FX_NEW CPDF_FormControl(
+  CPDF_FormControl* pControl = new CPDF_FormControl(
       (CPDF_FormField*)pField, (CPDF_Dictionary*)pWidgetDict);
   if (pControl == NULL) {
     return NULL;
diff --git a/core/src/fpdfdoc/doc_metadata.cpp b/core/src/fpdfdoc/doc_metadata.cpp
index 2bc14d9c33..e350ea6f41 100644
--- a/core/src/fpdfdoc/doc_metadata.cpp
+++ b/core/src/fpdfdoc/doc_metadata.cpp
@@ -22,7 +22,7 @@ CPDF_Metadata::CPDF_Metadata() {
   m_pData = FX_Alloc(PDFDOC_METADATA, 1);
   CFX_CMapByteStringToPtr*& pStringMap =
       ((PDFDOC_LPMETADATA)m_pData)->m_pStringMap;
-  pStringMap = FX_NEW CFX_CMapByteStringToPtr;
+  pStringMap = new CFX_CMapByteStringToPtr;
   if (pStringMap != NULL) {
     CFX_ByteString bstr;
     for (int i = 0; i < 18; i += 2) {
diff --git a/core/src/fpdfdoc/doc_tagged.cpp b/core/src/fpdfdoc/doc_tagged.cpp
index fe7e5e13b9..d8e24c78b3 100644
--- a/core/src/fpdfdoc/doc_tagged.cpp
+++ b/core/src/fpdfdoc/doc_tagged.cpp
@@ -19,7 +19,7 @@ CPDF_StructTree* CPDF_StructTree::LoadPage(const CPDF_Document* pDoc,
   if (!IsTagged(pDoc)) {
     return NULL;
   }
-  CPDF_StructTreeImpl* pTree = FX_NEW CPDF_StructTreeImpl(pDoc);
+  CPDF_StructTreeImpl* pTree = new CPDF_StructTreeImpl(pDoc);
   if (pTree == NULL) {
     return NULL;
   }
@@ -30,7 +30,7 @@ CPDF_StructTree* CPDF_StructTree::LoadDoc(const CPDF_Document* pDoc) {
   if (!IsTagged(pDoc)) {
     return NULL;
   }
-  CPDF_StructTreeImpl* pTree = FX_NEW CPDF_StructTreeImpl(pDoc);
+  CPDF_StructTreeImpl* pTree = new CPDF_StructTreeImpl(pDoc);
   if (pTree == NULL) {
     return NULL;
   }
@@ -62,7 +62,7 @@ void CPDF_StructTreeImpl::LoadDocTree() {
   }
   if (pKids->GetType() == PDFOBJ_DICTIONARY) {
     CPDF_StructElementImpl* pStructElementImpl =
-        FX_NEW CPDF_StructElementImpl(this, NULL, (CPDF_Dictionary*)pKids);
+        new CPDF_StructElementImpl(this, NULL, (CPDF_Dictionary*)pKids);
     if (pStructElementImpl == NULL) {
       return;
     }
@@ -76,7 +76,7 @@ void CPDF_StructTreeImpl::LoadDocTree() {
   for (FX_DWORD i = 0; i < pArray->GetCount(); i++) {
     CPDF_Dictionary* pKid = pArray->GetDict(i);
     CPDF_StructElementImpl* pStructElementImpl =
-        FX_NEW CPDF_StructElementImpl(this, NULL, pKid);
+        new CPDF_StructElementImpl(this, NULL, pKid);
     if (pStructElementImpl == NULL) {
       return;
     }
@@ -137,7 +137,7 @@ CPDF_StructElementImpl* CPDF_StructTreeImpl::AddPageNode(CPDF_Dictionary* pDict,
   if (map.Lookup(pDict, (void*&)pElement)) {
     return pElement;
   }
-  pElement = FX_NEW CPDF_StructElementImpl(this, NULL, pDict);
+  pElement = new CPDF_StructElementImpl(this, NULL, pDict);
   if (pElement == NULL) {
     return NULL;
   }
@@ -321,7 +321,7 @@ void CPDF_StructElementImpl::LoadKid(FX_DWORD PageObjNum,
     pKid->m_Element.m_pDict = pKidDict;
     if (m_pTree->m_pPage == NULL) {
       pKid->m_Element.m_pElement =
-          FX_NEW CPDF_StructElementImpl(m_pTree, this, pKidDict);
+          new CPDF_StructElementImpl(m_pTree, this, pKidDict);
     } else {
       pKid->m_Element.m_pElement = NULL;
     }
diff --git a/core/src/fpdfdoc/doc_vt.cpp b/core/src/fpdfdoc/doc_vt.cpp
index b2eaa8a5fc..77afab81b9 100644
--- a/core/src/fpdfdoc/doc_vt.cpp
+++ b/core/src/fpdfdoc/doc_vt.cpp
@@ -69,7 +69,7 @@ void CSection::ResetLinePlace() {
 }
 CPVT_WordPlace CSection::AddWord(const CPVT_WordPlace& place,
                                  const CPVT_WordInfo& wordinfo) {
-  if (CPVT_WordInfo* pWord = FX_NEW CPVT_WordInfo(wordinfo)) {
+  if (CPVT_WordInfo* pWord = new CPVT_WordInfo(wordinfo)) {
     int32_t nWordIndex =
         FPDF_MAX(FPDF_MIN(place.nWordIndex, m_WordArray.GetSize()), 0);
     if (nWordIndex == m_WordArray.GetSize()) {
@@ -815,8 +815,8 @@ void CPDF_VariableText::Initialize() {
   if (!m_bInitial) {
     CPVT_SectionInfo secinfo;
     if (m_bRichText) {
-      secinfo.pSecProps = FX_NEW CPVT_SecProps(0.0f, 0.0f, 0);
-      secinfo.pWordProps = FX_NEW CPVT_WordProps(GetDefaultFontIndex(),
+      secinfo.pSecProps = new CPVT_SecProps(0.0f, 0.0f, 0);
+      secinfo.pWordProps = new CPVT_WordProps(GetDefaultFontIndex(),
                                                  PVT_DEFAULT_FONTSIZE, 0, 0, 0);
     }
     CPVT_WordPlace place;
@@ -884,10 +884,10 @@ CPVT_WordPlace CPDF_VariableText::InsertSection(
     CPVT_SectionInfo secinfo;
     if (m_bRichText) {
       if (pSecProps) {
-        secinfo.pSecProps = FX_NEW CPVT_SecProps(*pSecProps);
+        secinfo.pSecProps = new CPVT_SecProps(*pSecProps);
       }
       if (pWordProps) {
-        secinfo.pWordProps = FX_NEW CPVT_WordProps(*pWordProps);
+        secinfo.pWordProps = new CPVT_WordProps(*pWordProps);
       }
     }
     AddSection(NewPlace, secinfo);
@@ -976,10 +976,10 @@ void CPDF_VariableText::SetText(const FX_WCHAR* text,
   CPVT_SectionInfo secinfo;
   if (m_bRichText) {
     if (pSecProps) {
-      secinfo.pSecProps = FX_NEW CPVT_SecProps(*pSecProps);
+      secinfo.pSecProps = new CPVT_SecProps(*pSecProps);
     }
     if (pWordProps) {
-      secinfo.pWordProps = FX_NEW CPVT_WordProps(*pWordProps);
+      secinfo.pWordProps = new CPVT_WordProps(*pWordProps);
     }
   }
   if (CSection* pSection = m_SectionArray.GetAt(0)) {
@@ -1662,7 +1662,7 @@ FX_BOOL CPDF_VariableText::IsLatinWord(FX_WORD word) {
 }
 IPDF_VariableText_Iterator* CPDF_VariableText::GetIterator() {
   if (!m_pVTIterator) {
-    return m_pVTIterator = FX_NEW CPDF_VariableText_Iterator(this);
+    return m_pVTIterator = new CPDF_VariableText_Iterator(this);
   }
   return m_pVTIterator;
 }
diff --git a/core/src/fpdfdoc/doc_vtmodule.cpp b/core/src/fpdfdoc/doc_vtmodule.cpp
index efb9d22dc5..834d459de3 100644
--- a/core/src/fpdfdoc/doc_vtmodule.cpp
+++ b/core/src/fpdfdoc/doc_vtmodule.cpp
@@ -8,7 +8,7 @@
 #include "../../include/fpdfdoc/fpdf_vt.h"
 #include "pdf_vt.h"
 IPDF_VariableText* IPDF_VariableText::NewVariableText() {
-  return FX_NEW CPDF_VariableText();
+  return new CPDF_VariableText();
 }
 void IPDF_VariableText::DelVariableText(IPDF_VariableText* pVT) {
   delete (CPDF_VariableText*)pVT;
diff --git a/core/src/fpdfdoc/pdf_vt.h b/core/src/fpdfdoc/pdf_vt.h
index 728dbbfebb..81d9d6a879 100644
--- a/core/src/fpdfdoc/pdf_vt.h
+++ b/core/src/fpdfdoc/pdf_vt.h
@@ -85,14 +85,14 @@ struct CPVT_SectionInfo {
       if (pSecProps) {
         *pSecProps = *other.pSecProps;
       } else {
-        pSecProps = FX_NEW CPVT_SecProps(*other.pSecProps);
+        pSecProps = new CPVT_SecProps(*other.pSecProps);
       }
     }
     if (other.pWordProps) {
       if (pWordProps) {
         *pWordProps = *other.pWordProps;
       } else {
-        pWordProps = FX_NEW CPVT_WordProps(*other.pWordProps);
+        pWordProps = new CPVT_WordProps(*other.pWordProps);
       }
     }
   }
@@ -162,7 +162,7 @@ struct CPVT_WordInfo {
       if (pWordProps) {
         *pWordProps = *word.pWordProps;
       } else {
-        pWordProps = FX_NEW CPVT_WordProps(*word.pWordProps);
+        pWordProps = new CPVT_WordProps(*word.pWordProps);
       }
     }
   }
@@ -223,7 +223,7 @@ class CLines {
   }
   int32_t Add(const CPVT_LineInfo& lineinfo) {
     if (m_nTotal >= GetSize()) {
-      if (CLine* pLine = FX_NEW CLine) {
+      if (CLine* pLine = new CLine) {
         pLine->m_LineInfo = lineinfo;
         m_Lines.Add(pLine);
         return m_nTotal++;