From ae51c810a44844ef437393c1768be8f7766586b2 Mon Sep 17 00:00:00 2001
From: Tom Sepez <tsepez@chromium.org>
Date: Wed, 5 Aug 2015 12:34:06 -0700
Subject: 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 .
---
 xfa/src/fxbarcode/oned/BC_OneDimReader.cpp      | 2 +-
 xfa/src/fxbarcode/oned/BC_OneDimWriter.cpp      | 2 +-
 xfa/src/fxbarcode/oned/BC_OnedCodaBarReader.cpp | 2 +-
 xfa/src/fxbarcode/oned/BC_OnedCode128Reader.cpp | 2 +-
 xfa/src/fxbarcode/oned/BC_OnedCode39Reader.cpp  | 2 +-
 xfa/src/fxbarcode/oned/BC_OnedUPCAReader.cpp    | 2 +-
 xfa/src/fxbarcode/oned/BC_OnedUPCAWriter.cpp    | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'xfa/src/fxbarcode/oned')

diff --git a/xfa/src/fxbarcode/oned/BC_OneDimReader.cpp b/xfa/src/fxbarcode/oned/BC_OneDimReader.cpp
index b0ad088637..77c34802b5 100644
--- a/xfa/src/fxbarcode/oned/BC_OneDimReader.cpp
+++ b/xfa/src/fxbarcode/oned/BC_OneDimReader.cpp
@@ -167,7 +167,7 @@ CFX_Int32Array* CBC_OneDimReader::FindGuardPattern(CBC_CommonBitArray* row,
       if (counterPosition == patternLength - 1) {
         if (PatternMatchVariance(&counters, &(*pattern)[0],
                                  MAX_INDIVIDUAL_VARIANCE) < MAX_AVG_VARIANCE) {
-          CFX_Int32Array* result = FX_NEW CFX_Int32Array();
+          CFX_Int32Array* result = new CFX_Int32Array();
           result->SetSize(2);
           (*result)[0] = patternStart;
           (*result)[1] = x;
diff --git a/xfa/src/fxbarcode/oned/BC_OneDimWriter.cpp b/xfa/src/fxbarcode/oned/BC_OneDimWriter.cpp
index 06b7d759cd..aaab954380 100644
--- a/xfa/src/fxbarcode/oned/BC_OneDimWriter.cpp
+++ b/xfa/src/fxbarcode/oned/BC_OneDimWriter.cpp
@@ -424,7 +424,7 @@ void CBC_OneDimWriter::RenderResult(const CFX_WideStringC& contents,
   if (!isDevice) {
     m_barWidth = codeLength * m_multiple;
   }
-  m_output = FX_NEW CBC_CommonBitMatrix;
+  m_output = new CBC_CommonBitMatrix;
   m_output->Init(outputWidth, outputHeight);
   int32_t outputX = leftPadding * m_multiple;
   for (int32_t inputX = 0; inputX < codeOldLength; inputX++) {
diff --git a/xfa/src/fxbarcode/oned/BC_OnedCodaBarReader.cpp b/xfa/src/fxbarcode/oned/BC_OnedCodaBarReader.cpp
index ed12f676b4..010406be8d 100644
--- a/xfa/src/fxbarcode/oned/BC_OnedCodaBarReader.cpp
+++ b/xfa/src/fxbarcode/oned/BC_OnedCodaBarReader.cpp
@@ -144,7 +144,7 @@ CFX_Int32Array* CBC_OnedCodaBarReader::FindAsteriskPattern(
                            patternStart, FALSE, e);
           BC_EXCEPTION_CHECK_ReturnValue(e, NULL);
           if (btemp3) {
-            CFX_Int32Array* result = FX_NEW CFX_Int32Array();
+            CFX_Int32Array* result = new CFX_Int32Array();
             result->SetSize(2);
             (*result)[0] = patternStart;
             (*result)[1] = i;
diff --git a/xfa/src/fxbarcode/oned/BC_OnedCode128Reader.cpp b/xfa/src/fxbarcode/oned/BC_OnedCode128Reader.cpp
index 4cffe9d78f..c1f74c8a61 100644
--- a/xfa/src/fxbarcode/oned/BC_OnedCode128Reader.cpp
+++ b/xfa/src/fxbarcode/oned/BC_OnedCode128Reader.cpp
@@ -119,7 +119,7 @@ CFX_Int32Array* CBC_OnedCode128Reader::FindStartPattern(CBC_CommonBitArray* row,
                            patternStart, FALSE, e);
           BC_EXCEPTION_CHECK_ReturnValue(e, NULL);
           if (btemp2) {
-            CFX_Int32Array* result = FX_NEW CFX_Int32Array;
+            CFX_Int32Array* result = new CFX_Int32Array;
             result->SetSize(3);
             (*result)[0] = patternStart;
             (*result)[1] = i;
diff --git a/xfa/src/fxbarcode/oned/BC_OnedCode39Reader.cpp b/xfa/src/fxbarcode/oned/BC_OnedCode39Reader.cpp
index 3678260033..9caa0cb43a 100644
--- a/xfa/src/fxbarcode/oned/BC_OnedCode39Reader.cpp
+++ b/xfa/src/fxbarcode/oned/BC_OnedCode39Reader.cpp
@@ -150,7 +150,7 @@ CFX_Int32Array* CBC_OnedCode39Reader::FindAsteriskPattern(
                            patternStart, FALSE, e);
           BC_EXCEPTION_CHECK_ReturnValue(e, NULL);
           if (bT1) {
-            CFX_Int32Array* result = FX_NEW CFX_Int32Array;
+            CFX_Int32Array* result = new CFX_Int32Array;
             result->SetSize(2);
             (*result)[0] = patternStart;
             (*result)[1] = i;
diff --git a/xfa/src/fxbarcode/oned/BC_OnedUPCAReader.cpp b/xfa/src/fxbarcode/oned/BC_OnedUPCAReader.cpp
index fd427eae64..d02e2a2966 100644
--- a/xfa/src/fxbarcode/oned/BC_OnedUPCAReader.cpp
+++ b/xfa/src/fxbarcode/oned/BC_OnedUPCAReader.cpp
@@ -30,7 +30,7 @@ CBC_OnedUPCAReader::CBC_OnedUPCAReader() {
   m_ean13Reader = NULL;
 }
 void CBC_OnedUPCAReader::Init() {
-  m_ean13Reader = FX_NEW CBC_OnedEAN13Reader;
+  m_ean13Reader = new CBC_OnedEAN13Reader;
 }
 CBC_OnedUPCAReader::~CBC_OnedUPCAReader() {
   if (m_ean13Reader != NULL) {
diff --git a/xfa/src/fxbarcode/oned/BC_OnedUPCAWriter.cpp b/xfa/src/fxbarcode/oned/BC_OnedUPCAWriter.cpp
index 66c7c2a798..da15a06d1a 100644
--- a/xfa/src/fxbarcode/oned/BC_OnedUPCAWriter.cpp
+++ b/xfa/src/fxbarcode/oned/BC_OnedUPCAWriter.cpp
@@ -31,7 +31,7 @@ CBC_OnedUPCAWriter::CBC_OnedUPCAWriter() {
   m_bRightPadding = TRUE;
 }
 void CBC_OnedUPCAWriter::Init() {
-  m_subWriter = FX_NEW CBC_OnedEAN13Writer;
+  m_subWriter = new CBC_OnedEAN13Writer;
 }
 CBC_OnedUPCAWriter::~CBC_OnedUPCAWriter() {
   if (m_subWriter != NULL) {
-- 
cgit v1.2.3