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

22 files changed, 24 insertions, 42 deletions

diff --git a/xfa/src/fxbarcode/qrcode/BC_FinderPatternInfo.h b/xfa/src/fxbarcode/qrcode/BC_FinderPatternInfo.h
index bac9291947..8e4cb13ed2 100644
--- a/xfa/src/fxbarcode/qrcode/BC_FinderPatternInfo.h
+++ b/xfa/src/fxbarcode/qrcode/BC_FinderPatternInfo.h
@@ -7,8 +7,7 @@
 #ifndef _BC_FINDERPATTERNINFO_H_

 #define _BC_FINDERPATTERNINFO_H_

 class CBC_QRFinderPattern;

-class CBC_QRFinderPatternInfo;

-class CBC_QRFinderPatternInfo : public CFX_Object

+class CBC_QRFinderPatternInfo

 {

 private:

     CBC_QRFinderPattern *m_bottomLeft;

diff --git a/xfa/src/fxbarcode/qrcode/BC_QRAlignmentPatternFinder.h b/xfa/src/fxbarcode/qrcode/BC_QRAlignmentPatternFinder.h
index 5471c4e62a..c1d224a8eb 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRAlignmentPatternFinder.h
+++ b/xfa/src/fxbarcode/qrcode/BC_QRAlignmentPatternFinder.h
@@ -8,8 +8,7 @@
 #define _BC_QRALIGNMENTPATTERNFINDER_H_

 class CBC_CommonBitMatrix;

 class CBC_QRAlignmentPattern;

-class CBC_QRAlignmentPatternFinder;

-class CBC_QRAlignmentPatternFinder  : public CFX_Object

+class CBC_QRAlignmentPatternFinder

 {

 private:

     CBC_CommonBitMatrix *m_image;

diff --git a/xfa/src/fxbarcode/qrcode/BC_QRBitMatrixParser.h b/xfa/src/fxbarcode/qrcode/BC_QRBitMatrixParser.h
index 2e176f63d3..0189ba7c81 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRBitMatrixParser.h
+++ b/xfa/src/fxbarcode/qrcode/BC_QRBitMatrixParser.h
@@ -10,8 +10,7 @@ class CBC_CommonBitMatrix ;
 class CBC_QRCoderVersion;

 class CBC_QRCoderFormatInformation;

 class CBC_QRDataMask;

-class CBC_QRBitMatrixParser;

-class CBC_QRBitMatrixParser  : public CFX_Object

+class CBC_QRBitMatrixParser

 {

 private:

     CBC_CommonBitMatrix *m_bitMatrix;

diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoder.h b/xfa/src/fxbarcode/qrcode/BC_QRCoder.h
index 89ce140fbd..3c24dc2bc9 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRCoder.h
+++ b/xfa/src/fxbarcode/qrcode/BC_QRCoder.h
@@ -9,8 +9,8 @@
 class CBC_QRCoderErrorCorrectionLevel ;

 class CBC_QRCoderMode;

 class CBC_CommonByteMatrix;

-class CBC_QRCoder;

-class CBC_QRCoder : public CFX_Object

+

+class CBC_QRCoder

 {

 private:

     CBC_QRCoderMode* m_mode;

diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderBitVector.h b/xfa/src/fxbarcode/qrcode/BC_QRCoderBitVector.h
index 6e9abba6c9..ae73fe8c88 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRCoderBitVector.h
+++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderBitVector.h
@@ -6,8 +6,7 @@
 

 #ifndef _BC_QRECODERBITVECTOR_H_

 #define _BC_QRECODERBITVECTOR_H_

-class CBC_QRCoderBitVector;

-class CBC_QRCoderBitVector  : public CFX_Object

+class CBC_QRCoderBitVector

 {

 private:

     FX_INT32 m_sizeInBits;

diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderBlockPair.h b/xfa/src/fxbarcode/qrcode/BC_QRCoderBlockPair.h
index 234ac1a776..6fb79bb596 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRCoderBlockPair.h
+++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderBlockPair.h
@@ -7,8 +7,7 @@
 #ifndef _BC_QRCODERBLOCKPAIR_H_

 #define _BC_QRCODERBLOCKPAIR_H_

 class CBC_CommonByteArray;

-class CBC_QRCoderBlockPair;

-class CBC_QRCoderBlockPair : public CFX_Object

+class CBC_QRCoderBlockPair

 {

 private:

     CBC_CommonByteArray* m_dataBytes;

diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderDecoder.h b/xfa/src/fxbarcode/qrcode/BC_QRCoderDecoder.h
index 355af78180..00238544c3 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRCoderDecoder.h
+++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderDecoder.h
@@ -12,8 +12,7 @@ class CBC_CommonDecoderResult;
 class CBC_QRBitMatrixParser;

 class CBC_QRCoderVersion;

 class CBC_QRDataBlock;

-class CBC_QRCoderDecoder;

-class CBC_QRCoderDecoder  : public CFX_Object

+class CBC_QRCoderDecoder

 {

 private:

     CBC_ReedSolomonDecoder *m_rsDecoder;

diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderECB.h b/xfa/src/fxbarcode/qrcode/BC_QRCoderECB.h
index c6494b75cd..e8c2d36999 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRCoderECB.h
+++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderECB.h
@@ -6,8 +6,7 @@
 

 #ifndef _BC_QRCODERECB_H_

 #define _BC_QRCODERECB_H_

-class CBC_QRCoderECB;

-class CBC_QRCoderECB  : public CFX_Object

+class CBC_QRCoderECB

 {

 private:

     FX_INT32 m_count;

diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderECBlocks.h b/xfa/src/fxbarcode/qrcode/BC_QRCoderECBlocks.h
index 385837510a..7f229742ab 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRCoderECBlocks.h
+++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderECBlocks.h
@@ -7,8 +7,7 @@
 #ifndef _BC_QRCODERECBLOCKS_H_

 #define _BC_QRCODERECBLOCKS_H_

 class CBC_QRCoderECB;

-class CBC_QRCoderECBlocks;

-class CBC_QRCoderECBlocks  : public CFX_Object

+class CBC_QRCoderECBlocks

 {

 private:

     FX_INT32 m_ecCodeWordsPerBlock;

diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderEncoder.cpp b/xfa/src/fxbarcode/qrcode/BC_QRCoderEncoder.cpp
index e072dc337e..3f6a644f0f 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRCoderEncoder.cpp
+++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderEncoder.cpp
@@ -50,7 +50,7 @@ CBC_QRCoderEncoder::CBC_QRCoderEncoder()
 CBC_QRCoderEncoder::~CBC_QRCoderEncoder()

 {

 }

-class Make_Pair : public CFX_Object

+class Make_Pair

 {

 public:

     CBC_QRCoderMode* m_mode;

diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderEncoder.h b/xfa/src/fxbarcode/qrcode/BC_QRCoderEncoder.h
index 8dea2a6477..f08d608fb8 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRCoderEncoder.h
+++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderEncoder.h
@@ -14,7 +14,7 @@ class CBC_QRCoderBitVector;
 class CBC_CommonByteArray;

 class CBC_CommonByteMatrix;

 class CBC_QRCoderEncoder;

-class CBC_QRCoderEncoder : public CFX_Object

+class CBC_QRCoderEncoder

 {

 private:

     const static FX_INT32 m_alphaNumbericTable[96];

diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.h b/xfa/src/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.h
index 2c0ad7b0b7..907c20d1cc 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.h
+++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.h
@@ -6,8 +6,7 @@
 

 #ifndef _BC_QRCODERERRORCORRECTIONLEVEL_H_

 #define _BC_QRCODERERRORCORRECTIONLEVEL_H_

-class CBC_QRCoderErrorCorrectionLevel;

-class CBC_QRCoderErrorCorrectionLevel  : public CFX_Object

+class CBC_QRCoderErrorCorrectionLevel

 {

 private:

     FX_INT32 m_ordinal;

diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderFormatInformation.h b/xfa/src/fxbarcode/qrcode/BC_QRCoderFormatInformation.h
index 9d828c8380..49265e5033 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRCoderFormatInformation.h
+++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderFormatInformation.h
@@ -7,8 +7,7 @@
 #ifndef _BC_QRCODERFORMATINFORMATION_H_

 #define _BC_QRCODERFORMATINFORMATION_H_

 class CBC_QRCoderErrorCorrectionLevel;

-class CBC_QRCoderFormatInformation;

-class CBC_QRCoderFormatInformation  : public CFX_Object

+class CBC_QRCoderFormatInformation

 {

 private:

     const static FX_INT32 FORMAT_INFO_MASK_QR;

diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderMaskUtil.h b/xfa/src/fxbarcode/qrcode/BC_QRCoderMaskUtil.h
index 134d344e72..13bb11691a 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRCoderMaskUtil.h
+++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderMaskUtil.h
@@ -7,8 +7,7 @@
 #ifndef _BC_QRCODERMASKUTIL_H_

 #define _BC_QRCODERMASKUTIL_H_

 class CBC_CommonByteMatrix;

-class CBC_QRCoderMaskUtil;

-class CBC_QRCoderMaskUtil  : public CFX_Object

+class CBC_QRCoderMaskUtil

 {

 public:

     CBC_QRCoderMaskUtil();

diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderMatrixUtil.h b/xfa/src/fxbarcode/qrcode/BC_QRCoderMatrixUtil.h
index 23a9d88128..ce1e65d4c2 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRCoderMatrixUtil.h
+++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderMatrixUtil.h
@@ -9,8 +9,7 @@
 class CBC_CommonByteMatrix;

 class CBC_QRCoderErrorCorrectionLevel;

 class CBC_QRCoderBitVector;

-class CBC_QRCoderMatrixUtil;

-class CBC_QRCoderMatrixUtil  : public CFX_Object

+class CBC_QRCoderMatrixUtil

 {

 private:

     const static FX_INT32 POSITION_DETECTION_PATTERN[7][7];

diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderMode.h b/xfa/src/fxbarcode/qrcode/BC_QRCoderMode.h
index 71cea9fc78..fbd90871cf 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRCoderMode.h
+++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderMode.h
@@ -7,8 +7,7 @@
 #ifndef _BC_QRCODERMODE_H_

 #define _BC_QRCODERMODE_H_

 class CBC_QRCoderVersion;

-class CBC_QRCoderMode;

-class CBC_QRCoderMode  : public CFX_Object

+class CBC_QRCoderMode

 {

 private:

     FX_INT32* m_characterCountBitsForVersions;

diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderVersion.h b/xfa/src/fxbarcode/qrcode/BC_QRCoderVersion.h
index b693dd6dd7..17d392121d 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRCoderVersion.h
+++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderVersion.h
@@ -9,8 +9,7 @@
 class CBC_QRCoderECBlocks;

 class CBC_CommonBitMatrix;

 class CBC_QRCoderErrorCorrectionLevel;

-class CBC_QRCoderVersion;

-class CBC_QRCoderVersion : public CFX_Object

+class CBC_QRCoderVersion

 {

 private:

     const static FX_INT32 VERSION_DECODE_INFO[34];

diff --git a/xfa/src/fxbarcode/qrcode/BC_QRDataBlock.h b/xfa/src/fxbarcode/qrcode/BC_QRDataBlock.h
index 4f68c7a9f3..d5697ff724 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRDataBlock.h
+++ b/xfa/src/fxbarcode/qrcode/BC_QRDataBlock.h
@@ -10,8 +10,7 @@ class CBC_QRCoderVersion;
 class CBC_QRCoderECBlocks;

 class CBC_QRCoderECB;

 class CBC_QRCoderErrorCorrectionLevel;

-class CBC_QRDataBlock;

-class CBC_QRDataBlock : public CFX_Object

+class CBC_QRDataBlock

 {

 private:

     FX_INT32 m_numDataCodewords;

diff --git a/xfa/src/fxbarcode/qrcode/BC_QRDataMask.h b/xfa/src/fxbarcode/qrcode/BC_QRDataMask.h
index 6fcc09d556..221218f34a 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRDataMask.h
+++ b/xfa/src/fxbarcode/qrcode/BC_QRDataMask.h
@@ -7,8 +7,7 @@
 #ifndef _BC_QRDATAMASK_H_

 #define _BC_QRDATAMASK_H_

 class CBC_CommonBitMatrix;

-class CBC_QRDataMask;

-class CBC_QRDataMask  : public CFX_Object

+class CBC_QRDataMask

 {

 public:

     static CFX_PtrArray *DATA_MASKS;

diff --git a/xfa/src/fxbarcode/qrcode/BC_QRDecodedBitStreamParser.h b/xfa/src/fxbarcode/qrcode/BC_QRDecodedBitStreamParser.h
index b64485f788..f4ac06b984 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRDecodedBitStreamParser.h
+++ b/xfa/src/fxbarcode/qrcode/BC_QRDecodedBitStreamParser.h
@@ -11,8 +11,7 @@ class CBC_QRCoderErrorCorrectionLevel;
 class CBC_CommonBitSource;

 class CBC_QRCoderVersion;

 class CBC_CommonCharacterSetECI;

-class CBC_QRDecodedBitStreamParser;

-class CBC_QRDecodedBitStreamParser  : public CFX_Object

+class CBC_QRDecodedBitStreamParser

 {

 private:

     const static FX_CHAR ALPHANUMERIC_CHARS[45];

diff --git a/xfa/src/fxbarcode/qrcode/BC_QRDetectorResult.h b/xfa/src/fxbarcode/qrcode/BC_QRDetectorResult.h
index 13f6d3dc46..f6b38e5a30 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRDetectorResult.h
+++ b/xfa/src/fxbarcode/qrcode/BC_QRDetectorResult.h
@@ -8,8 +8,7 @@
 #define _BC_QRDETECTORRESULT_H_

 class CBC_CommonBitMatrix;

 class CBC_ResultPoint;

-class CBC_QRDetectorResult;

-class CBC_QRDetectorResult  : public CFX_Object

+class CBC_QRDetectorResult

 {

 private:

     CBC_CommonBitMatrix *m_bits;

diff --git a/xfa/src/fxbarcode/qrcode/BC_QRFinderPatternFinder.h b/xfa/src/fxbarcode/qrcode/BC_QRFinderPatternFinder.h
index 7470b553ee..d0fde46542 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRFinderPatternFinder.h
+++ b/xfa/src/fxbarcode/qrcode/BC_QRFinderPatternFinder.h
@@ -10,8 +10,8 @@ class CBC_CommonBitMatrix;
 class CBC_QRFinderPattern;

 class CBC_ResultPoint;

 class CBC_QRFinderPatternInfo;

-class CBC_QRFinderPatternFinder;

-class CBC_QRFinderPatternFinder  : public CFX_Object

+

+class CBC_QRFinderPatternFinder

 {

 private:

     const static FX_INT32 CENTER_QUORUM;