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

13 files changed, 13 insertions, 26 deletions

diff --git a/xfa/src/fxbarcode/common/BC_CommonBitArray.h b/xfa/src/fxbarcode/common/BC_CommonBitArray.h
index 484d87d5a7..d1c8f6d528 100644
--- a/xfa/src/fxbarcode/common/BC_CommonBitArray.h
+++ b/xfa/src/fxbarcode/common/BC_CommonBitArray.h
@@ -6,8 +6,7 @@
 

 #ifndef _BC_COMMONBITARRAY_H_

 #define _BC_COMMONBITARRAY_H_

-class CBC_CommonBitArray;

-class CBC_CommonBitArray  : public CFX_Object

+class CBC_CommonBitArray

 {

 public:

     CBC_CommonBitArray(CBC_CommonBitArray* array);

diff --git a/xfa/src/fxbarcode/common/BC_CommonBitMatrix.h b/xfa/src/fxbarcode/common/BC_CommonBitMatrix.h
index f69d7a0e33..8641ef1f63 100644
--- a/xfa/src/fxbarcode/common/BC_CommonBitMatrix.h
+++ b/xfa/src/fxbarcode/common/BC_CommonBitMatrix.h
@@ -7,8 +7,7 @@
 #ifndef _BC_COMMONBITMATRIX_H_

 #define _BC_COMMONBITMATRIX_H_

 class CBC_CommonBitArray;

-class CBC_CommonBitMatrix;

-class CBC_CommonBitMatrix  : public CFX_Object

+class CBC_CommonBitMatrix

 {

 public:

     CBC_CommonBitMatrix();

diff --git a/xfa/src/fxbarcode/common/BC_CommonBitSource.h b/xfa/src/fxbarcode/common/BC_CommonBitSource.h
index 53891cf671..f6a5985ae2 100644
--- a/xfa/src/fxbarcode/common/BC_CommonBitSource.h
+++ b/xfa/src/fxbarcode/common/BC_CommonBitSource.h
@@ -6,8 +6,7 @@
 

 #ifndef _BC_COMMONBITSOURCE_H_

 #define _BC_COMMONBITSOURCE_H_

-class CBC_CommonBitSource;

-class CBC_CommonBitSource  : public CFX_Object

+class CBC_CommonBitSource

 {

 public:

     CBC_CommonBitSource(CFX_ByteArray *bytes);

diff --git a/xfa/src/fxbarcode/common/BC_CommonByteArray.h b/xfa/src/fxbarcode/common/BC_CommonByteArray.h
index fe0a67ffd1..b9baf8a964 100644
--- a/xfa/src/fxbarcode/common/BC_CommonByteArray.h
+++ b/xfa/src/fxbarcode/common/BC_CommonByteArray.h
@@ -6,8 +6,7 @@
 

 #ifndef _BC_COMMONBYTEARRAY_H_

 #define _BC_COMMONBYTEARRAY_H_

-class CBC_CommonByteArray;

-class CBC_CommonByteArray  : public CFX_Object

+class CBC_CommonByteArray

 {

 private:

     FX_INT32 m_size;

diff --git a/xfa/src/fxbarcode/common/BC_CommonByteMatrix.h b/xfa/src/fxbarcode/common/BC_CommonByteMatrix.h
index 3d831d1911..55277660f3 100644
--- a/xfa/src/fxbarcode/common/BC_CommonByteMatrix.h
+++ b/xfa/src/fxbarcode/common/BC_CommonByteMatrix.h
@@ -6,8 +6,7 @@
 

 #ifndef _BC_COMMONBYTEMATRIX_H_

 #define _BC_COMMONBYTEMATRIX_H_

-class CBC_CommonByteMatrix;

-class CBC_CommonByteMatrix  : public CFX_Object

+class CBC_CommonByteMatrix

 {

 public:

     CBC_CommonByteMatrix(FX_INT32 width, FX_INT32 height);

diff --git a/xfa/src/fxbarcode/common/BC_CommonDecoderResult.h b/xfa/src/fxbarcode/common/BC_CommonDecoderResult.h
index 808203bd01..5f41afc774 100644
--- a/xfa/src/fxbarcode/common/BC_CommonDecoderResult.h
+++ b/xfa/src/fxbarcode/common/BC_CommonDecoderResult.h
@@ -8,8 +8,7 @@
 #define _BC_COMMONDECODERRESULT_H_

 class CBC_QRCoderErrorCorrectionLevel;

 class CBC_PDF417ResultMetadata;

-class CBC_CommonDecoderResult;

-class CBC_CommonDecoderResult  : public CFX_Object

+class CBC_CommonDecoderResult

 {

 public:

     CBC_CommonDecoderResult();

diff --git a/xfa/src/fxbarcode/common/BC_CommonECI.h b/xfa/src/fxbarcode/common/BC_CommonECI.h
index 3907066066..7a4ae6b8a6 100644
--- a/xfa/src/fxbarcode/common/BC_CommonECI.h
+++ b/xfa/src/fxbarcode/common/BC_CommonECI.h
@@ -6,8 +6,7 @@
 

 #ifndef _BC_COMMONECI_H_

 #define _BC_COMMONECI_H_

-class CBC_CommonECI;

-class CBC_CommonECI  : public CFX_Object

+class CBC_CommonECI

 {

 public:

     CBC_CommonECI(FX_INT32 value);

diff --git a/xfa/src/fxbarcode/common/BC_CommonPerspectiveTransform.h b/xfa/src/fxbarcode/common/BC_CommonPerspectiveTransform.h
index 5c42a1a6a7..cf7f804a2c 100644
--- a/xfa/src/fxbarcode/common/BC_CommonPerspectiveTransform.h
+++ b/xfa/src/fxbarcode/common/BC_CommonPerspectiveTransform.h
@@ -6,8 +6,7 @@
 

 #ifndef _BC_COMMONPERSPECTIVETRANSFORM_H_

 #define _BC_COMMONPERSPECTIVETRANSFORM_H_

-class CBC_CommonPerspectiveTransform;

-class CBC_CommonPerspectiveTransform : public CFX_Object

+class CBC_CommonPerspectiveTransform

 {

 public:

     CBC_CommonPerspectiveTransform(FX_FLOAT a11, FX_FLOAT a21, FX_FLOAT a31,

diff --git a/xfa/src/fxbarcode/common/BC_WhiteRectangleDetector.h b/xfa/src/fxbarcode/common/BC_WhiteRectangleDetector.h
index 83d91ced92..40146d39de 100644
--- a/xfa/src/fxbarcode/common/BC_WhiteRectangleDetector.h
+++ b/xfa/src/fxbarcode/common/BC_WhiteRectangleDetector.h
@@ -8,8 +8,7 @@
 #define _BC_WHITERECTANLEDETECTOR_H_

 class CBC_CommonBitMatrix;

 class CBC_ResultPoint;

-class CBC_WhiteRectangleDetector;

-class CBC_WhiteRectangleDetector : public CFX_Object

+class CBC_WhiteRectangleDetector

 {

 public:

     CBC_WhiteRectangleDetector(CBC_CommonBitMatrix *image);

diff --git a/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomon.h b/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomon.h
index 2950b8f315..713f343d98 100644
--- a/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomon.h
+++ b/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomon.h
@@ -8,8 +8,7 @@
 #define _BC_READSOLOMON_H_

 class CBC_ReedSolomonGF256;

 class CBC_ReedSolomonGF256Poly;

-class  CBC_ReedSolomonEncoder;

-class CBC_ReedSolomonEncoder : public CFX_Object

+class CBC_ReedSolomonEncoder

 {

 private:

     CBC_ReedSolomonGF256* m_field;

diff --git a/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonDecoder.h b/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonDecoder.h
index c1dd0f03f5..db026edd01 100644
--- a/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonDecoder.h
+++ b/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonDecoder.h
@@ -8,8 +8,7 @@
 #define _BC_REEDSOLOMONDECODER_H_

 class CBC_ReedSolomonGF256;

 class CBC_ReedSolomonGF256Poly;

-class CBC_ReedSolomonDecoder;

-class CBC_ReedSolomonDecoder : public CFX_Object

+class CBC_ReedSolomonDecoder

 {

 private:

     CBC_ReedSolomonGF256 * m_field;

diff --git a/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.h b/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.h
index 1687b95e09..40e7ffef28 100644
--- a/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.h
+++ b/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.h
@@ -7,8 +7,7 @@
 #ifndef _BC_REEDSOLOMONGF256_H_

 #define _BC_REEDSOLOMONGF256_H_

 class CBC_ReedSolomonGF256Poly;

-class CBC_ReedSolomonGF256;

-class CBC_ReedSolomonGF256 : public CFX_Object

+class CBC_ReedSolomonGF256

 {

 public:

     static void Initialize();

diff --git a/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256Poly.h b/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256Poly.h
index a6db24e231..5c9ae6cce6 100644
--- a/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256Poly.h
+++ b/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256Poly.h
@@ -7,8 +7,7 @@
 #ifndef _BC_READSOLOMONGF256POLY_H_

 #define _BC_READSOLOMONGF256POLY_H_

 class CBC_ReedSolomonGF256;

-class CBC_ReedSolomonGF256Poly;

-class CBC_ReedSolomonGF256Poly : public CFX_Object

+class CBC_ReedSolomonGF256Poly

 {

 public:

     CBC_ReedSolomonGF256Poly(CBC_ReedSolomonGF256* field, FX_INT32 coefficients);