Merge to XFA: Kill CFX_Object.

Not just a simple merge, but changes to remove CFX_Object from XFA.

Original Review URL: https://codereview.chromium.org/1088733002
TBR=thestig@chromium.org

Review URL: https://codereview.chromium.org/1087053002

10 files changed, 12 insertions, 21 deletions

diff --git a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixBitMatrixParser.h b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixBitMatrixParser.h
index c5f1f3f7a0..812aa6424f 100644
--- a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixBitMatrixParser.h
+++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixBitMatrixParser.h
@@ -8,8 +8,7 @@
 #define _BC_DATAMATRIXBITMATRIXPARSER_H_

 class CBC_CommonBitMatrix;

 class CBC_DataMatrixVersion;

-class CBC_DataMatrixBitMatrixParser;

-class CBC_DataMatrixBitMatrixParser : public CFX_Object

+class CBC_DataMatrixBitMatrixParser

 {

 public:

     CBC_DataMatrixBitMatrixParser();

diff --git a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDataBlock.h b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDataBlock.h
index 1dd62fe1fe..d0f4af036e 100644
--- a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDataBlock.h
+++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDataBlock.h
@@ -7,8 +7,7 @@
 #ifndef _BC_DATAMATRIXDATABLOCK_H_

 #define _BC_DATAMATRIXDATABLOCK_H_

 class CBC_DataMatrixVersion;

-class CBC_DataMatrixDataBlock;

-class CBC_DataMatrixDataBlock : public CFX_Object

+class CBC_DataMatrixDataBlock

 {

 public:

     virtual ~CBC_DataMatrixDataBlock();

diff --git a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecodedBitStreamParser.h b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecodedBitStreamParser.h
index 060972d53a..45db800176 100644
--- a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecodedBitStreamParser.h
+++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecodedBitStreamParser.h
@@ -8,8 +8,7 @@
 #define _BC_DATAMATRIXDECODEDBITSTREAMPARSER_H_

 class CBC_CommonDecoderResult;

 class CBC_CommonBitSource;

-class CBC_DataMatrixDecodedBitStreamParser;

-class CBC_DataMatrixDecodedBitStreamParser : public CFX_Object

+class CBC_DataMatrixDecodedBitStreamParser

 {

 public:

     CBC_DataMatrixDecodedBitStreamParser();

diff --git a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecoder.h b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecoder.h
index 44f7efc7b7..1d6059379b 100644
--- a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecoder.h
+++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecoder.h
@@ -9,8 +9,7 @@
 class CBC_ReedSolomonDecoder;

 class CBC_CommonDecoderResult;

 class CBC_CommonBitMatrix;

-class  CBC_DataMatrixDecoder;

-class CBC_DataMatrixDecoder  : public CFX_Object

+class CBC_DataMatrixDecoder

 {

 public:

     CBC_DataMatrixDecoder();

diff --git a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDetector.h b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDetector.h
index 2d3ca744fe..a9e244c5f4 100644
--- a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDetector.h
+++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDetector.h
@@ -12,7 +12,7 @@ class CBC_ResultPoint;
 class CBC_QRDetectorResult;

 class CBC_DataMatrixDetector;

 class ResultPointsAndTransitions;

-class CBC_ResultPointsAndTransitions : public CFX_Object

+class CBC_ResultPointsAndTransitions

 {

 public:

     CBC_ResultPointsAndTransitions(CBC_ResultPoint *from, CBC_ResultPoint *to, FX_INT32 transitions)

diff --git a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixVersion.h b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixVersion.h
index 41d2f23db6..9661834bd8 100644
--- a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixVersion.h
+++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixVersion.h
@@ -6,10 +6,9 @@
 

 #ifndef _BC_DATAMATRIXVERSION_H_

 #define _BC_DATAMATRIXVERSION_H_

-class ECB;

 class ECBlocks;

 class CBC_DataMatrixVersion;

-class ECB : public CFX_Object

+class ECB

 {

 public:

     ECB(FX_INT32 count, FX_INT32 dataCodewords)

@@ -31,7 +30,7 @@ private:
     FX_INT32 m_count;

     FX_INT32 m_dataCodewords;

 };

-class ECBlocks : public CFX_Object

+class ECBlocks

 {

 public:

     ECBlocks(FX_INT32 ecCodewords, ECB *ecBlocks)

@@ -67,7 +66,7 @@ private:
     FX_INT32 m_ecCodewords;

     CFX_PtrArray m_ecBlocks;

 };

-class CBC_DataMatrixVersion  : public CFX_Object

+class CBC_DataMatrixVersion

 {

 public:

     CBC_DataMatrixVersion(FX_INT32 versionNumber,

diff --git a/xfa/src/fxbarcode/datamatrix/BC_DefaultPlacement.h b/xfa/src/fxbarcode/datamatrix/BC_DefaultPlacement.h
index ba2da03408..2194e9f18a 100644
--- a/xfa/src/fxbarcode/datamatrix/BC_DefaultPlacement.h
+++ b/xfa/src/fxbarcode/datamatrix/BC_DefaultPlacement.h
@@ -6,8 +6,7 @@
 

 #ifndef _BC_DEFAULTPLACEMENT_H_

 #define _BC_DEFAULTPLACEMENT_H_

-class CBC_DefaultPlacement;

-class CBC_DefaultPlacement : public CFX_Object

+class CBC_DefaultPlacement

 {

 public:

     CBC_DefaultPlacement(CFX_WideString codewords, FX_INT32 numcols, FX_INT32 numrows);

diff --git a/xfa/src/fxbarcode/datamatrix/BC_Encoder.h b/xfa/src/fxbarcode/datamatrix/BC_Encoder.h
index 10ac8763e5..7d1a1b5b62 100644
--- a/xfa/src/fxbarcode/datamatrix/BC_Encoder.h
+++ b/xfa/src/fxbarcode/datamatrix/BC_Encoder.h
@@ -7,8 +7,7 @@
 #ifndef _BC_ENCODER_H_

 #define _BC_ENCODER_H_

 class CBC_EncoderContext;

-class CBC_Encoder;

-class CBC_Encoder : public CFX_Object

+class CBC_Encoder

 {

 public:

     CBC_Encoder();

diff --git a/xfa/src/fxbarcode/datamatrix/BC_ErrorCorrection.h b/xfa/src/fxbarcode/datamatrix/BC_ErrorCorrection.h
index 973ff33b8e..0bc71cdeb5 100644
--- a/xfa/src/fxbarcode/datamatrix/BC_ErrorCorrection.h
+++ b/xfa/src/fxbarcode/datamatrix/BC_ErrorCorrection.h
@@ -7,8 +7,7 @@
 #ifndef _BC_ERRORCORRECTION_H_

 #define _BC_ERRORCORRECTION_H_

 class CBC_SymbolInfo;

-class CBC_ErrorCorrection;

-class CBC_ErrorCorrection : public CFX_Object

+class CBC_ErrorCorrection

 {

 public:

     CBC_ErrorCorrection();

diff --git a/xfa/src/fxbarcode/datamatrix/BC_SymbolShapeHint.h b/xfa/src/fxbarcode/datamatrix/BC_SymbolShapeHint.h
index 2b030012a3..adda8c8ea8 100644
--- a/xfa/src/fxbarcode/datamatrix/BC_SymbolShapeHint.h
+++ b/xfa/src/fxbarcode/datamatrix/BC_SymbolShapeHint.h
@@ -6,8 +6,7 @@
 

 #ifndef _BC_SYMBOLSHAPEHINT_H_

 #define _BC_SYMBOLSHAPEHINT_H_

-class CBC_SymbolShapeHint;

-class CBC_SymbolShapeHint : public CFX_Object

+class CBC_SymbolShapeHint

 {

 public:

     CBC_SymbolShapeHint();