From 6fc8cbb4ffbc17732045d243e1b95bc04c8a3b33 Mon Sep 17 00:00:00 2001
From: Tom Sepez <tsepez@chromium.org>
Date: Tue, 14 Apr 2015 13:50:34 -0700
Subject: 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
---
 xfa/src/fxbarcode/pdf417/BC_PDF417.h                       | 3 +--
 xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.h          | 3 +--
 xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMetadata.h        | 2 +-
 xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeRow.h             | 3 +--
 xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeValue.h           | 3 +--
 xfa/src/fxbarcode/pdf417/BC_PDF417BoundingBox.h            | 3 +--
 xfa/src/fxbarcode/pdf417/BC_PDF417Codeword.h               | 3 +--
 xfa/src/fxbarcode/pdf417/BC_PDF417CodewordDecoder.h        | 4 ++--
 xfa/src/fxbarcode/pdf417/BC_PDF417Common.h                 | 3 +--
 xfa/src/fxbarcode/pdf417/BC_PDF417Compaction.h             | 2 +-
 xfa/src/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.h | 3 +--
 xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResult.h        | 3 +--
 xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultColumn.h  | 3 +--
 xfa/src/fxbarcode/pdf417/BC_PDF417Detector.h               | 3 +--
 xfa/src/fxbarcode/pdf417/BC_PDF417DetectorResult.h         | 3 +--
 xfa/src/fxbarcode/pdf417/BC_PDF417Dimensions.h             | 3 +--
 xfa/src/fxbarcode/pdf417/BC_PDF417ECErrorCorrection.h      | 3 +--
 xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusGF.h            | 3 +--
 xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusPoly.h          | 3 +--
 xfa/src/fxbarcode/pdf417/BC_PDF417ErrorCorrection.h        | 3 +--
 xfa/src/fxbarcode/pdf417/BC_PDF417HighLevelEncoder.h       | 2 +-
 xfa/src/fxbarcode/pdf417/BC_PDF417ResultMetadata.h         | 3 +--
 xfa/src/fxbarcode/pdf417/BC_PDF417ScanningDecoder.h        | 4 ++--
 23 files changed, 25 insertions(+), 43 deletions(-)

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

diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417.h b/xfa/src/fxbarcode/pdf417/BC_PDF417.h
index ab31244add..928afe80d2 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417.h
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417.h
@@ -9,8 +9,7 @@
 class CBC_Compaction;
 class CBC_BarcodeRow;
 class CBC_BarcodeMatrix;
-class CBC_PDF417;
-class CBC_PDF417 : public CFX_Object
+class CBC_PDF417
 {
 public:
     CBC_PDF417();
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.h b/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.h
index d8a0c5d0ae..ce0681bfa8 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.h
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.h
@@ -7,8 +7,7 @@
 #ifndef _BC_BARCODEMATRIX_H_
 #define _BC_BARCODEMATRIX_H_
 class CBC_BarcodeRow;
-class CBC_BarcodeMatrix;
-class CBC_BarcodeMatrix : public CFX_Object
+class CBC_BarcodeMatrix
 {
 public:
     CBC_BarcodeMatrix();
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMetadata.h b/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMetadata.h
index 62b1282827..6e2aa4d952 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMetadata.h
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMetadata.h
@@ -7,7 +7,7 @@
 #ifndef _BC_BARCODEMETADATA_H_
 #define _BC_BARCODEMETADATA_H_
 class CBC_BarcodeMetadata;
-class CBC_BarcodeMetadata : public CFX_Object
+class CBC_BarcodeMetadata
 {
 public:
     CBC_BarcodeMetadata(FX_INT32 columnCount, FX_INT32 rowCountUpperPart, FX_INT32 rowCountLowerPart, FX_INT32 errorCorrectionLevel);
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeRow.h b/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeRow.h
index 75fd15b653..c5520f6440 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeRow.h
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeRow.h
@@ -6,8 +6,7 @@
 
 #ifndef _BC_BARCODEROW_H_
 #define _BC_BARCODEROW_H_
-class CBC_BarcodeRow;
-class CBC_BarcodeRow : public CFX_Object
+class CBC_BarcodeRow
 {
 public:
     CBC_BarcodeRow(FX_INT32 width);
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeValue.h b/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeValue.h
index 1695c8ac5a..6922d410f0 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeValue.h
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeValue.h
@@ -6,8 +6,7 @@
 
 #ifndef _BC_BARCODEVALUE_H_
 #define _BC_BARCODEVALUE_H_
-class CBC_BarcodeValue;
-class CBC_BarcodeValue : public CFX_Object
+class CBC_BarcodeValue
 {
 public:
     CBC_BarcodeValue();
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417BoundingBox.h b/xfa/src/fxbarcode/pdf417/BC_PDF417BoundingBox.h
index efae2b706f..26bd1881c3 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417BoundingBox.h
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417BoundingBox.h
@@ -8,8 +8,7 @@
 #define _BC_BOUNDINGBOX_H_
 class CBC_CommonBitMatrix;
 class CBC_ResultPoint;
-class CBC_BoundingBox;
-class CBC_BoundingBox : public CFX_Object
+class CBC_BoundingBox
 {
 public:
     CBC_BoundingBox(CBC_CommonBitMatrix* image, CBC_ResultPoint* topLeft, CBC_ResultPoint* bottomLeft, CBC_ResultPoint* topRight, CBC_ResultPoint* bottomRight, FX_INT32 &e);
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417Codeword.h b/xfa/src/fxbarcode/pdf417/BC_PDF417Codeword.h
index 93b3cf6bb3..ea0524cbf8 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417Codeword.h
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417Codeword.h
@@ -6,8 +6,7 @@
 
 #ifndef _BC_CODEWORD_H_
 #define _BC_CODEWORD_H_
-class CBC_Codeword;
-class CBC_Codeword : public CFX_Object
+class CBC_Codeword
 {
 public:
     CBC_Codeword(FX_INT32 startX, FX_INT32 endX, FX_INT32 bucket, FX_INT32 value);
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417CodewordDecoder.h b/xfa/src/fxbarcode/pdf417/BC_PDF417CodewordDecoder.h
index da22683bfa..f76d16d015 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417CodewordDecoder.h
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417CodewordDecoder.h
@@ -6,10 +6,10 @@
 
 #ifndef _BC_PDF417CODEWORDDECODER_H_
 #define _BC_PDF417CODEWORDDECODER_H_
-class CBC_PDF417Common;
 class CBC_PDF417CodewordDecoder;
 #define    column     8
-class CBC_PDF417CodewordDecoder : public CFX_Object
+class CBC_PDF417Common;
+class CBC_PDF417CodewordDecoder
 {
 public:
     CBC_PDF417CodewordDecoder();
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417Common.h b/xfa/src/fxbarcode/pdf417/BC_PDF417Common.h
index 19e3fe57da..2d6258951e 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417Common.h
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417Common.h
@@ -6,8 +6,7 @@
 
 #ifndef _BC_PDF417COMMON_H_
 #define _BC_PDF417COMMON_H_
-class CBC_PDF417Common;
-class CBC_PDF417Common : public CFX_Object
+class CBC_PDF417Common
 {
 public:
     CBC_PDF417Common();
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417Compaction.h b/xfa/src/fxbarcode/pdf417/BC_PDF417Compaction.h
index 774a23fbdf..34af4ac0f6 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417Compaction.h
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417Compaction.h
@@ -13,7 +13,7 @@ enum Compaction {
     BYTES,
     NUMERIC
 };
-class CBC_Compaction : public CFX_Object
+class CBC_Compaction
 {
 public:
     CBC_Compaction();
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.h b/xfa/src/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.h
index 64ae2aee53..4c97bc3f24 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.h
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.h
@@ -8,8 +8,7 @@
 #define _BC_DECODEDBITSTREAMPARSER_H_
 class CBC_CommonDecoderResult;
 class CBC_PDF417ResultMetadata;
-class CBC_DecodedBitStreamPaser;
-class CBC_DecodedBitStreamPaser : public CFX_Object
+class CBC_DecodedBitStreamPaser
 {
 public:
     CBC_DecodedBitStreamPaser();
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResult.h b/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResult.h
index 9c3401459b..55a5a8f134 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResult.h
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResult.h
@@ -10,8 +10,7 @@ class CBC_BarcodeMetadata;
 class CBC_BoundingBox;
 class CBC_Codeword;
 class CBC_DetectionResultColumn;
-class CBC_DetectionResult;
-class CBC_DetectionResult : public CFX_Object
+class CBC_DetectionResult
 {
 public:
     CBC_DetectionResult(CBC_BarcodeMetadata* barcodeMetadata, CBC_BoundingBox* boundingBox);
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultColumn.h b/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultColumn.h
index eddc3bce6d..202272d2e9 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultColumn.h
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultColumn.h
@@ -8,8 +8,7 @@
 #define _BC_DETECTIONRESULTCOLUMN_H_
 class CBC_Codeword;
 class CBC_BoundingBox;
-class CBC_DetectionResultColumn;
-class CBC_DetectionResultColumn : public CFX_Object
+class CBC_DetectionResultColumn
 {
 public:
     CBC_DetectionResultColumn(CBC_BoundingBox* boundingBox);
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417Detector.h b/xfa/src/fxbarcode/pdf417/BC_PDF417Detector.h
index 557559e1f7..c160779122 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417Detector.h
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417Detector.h
@@ -10,8 +10,7 @@ class CBC_PDF417DetectorResult;
 class CBC_BinaryBitmap;
 class CBC_CommonBitMatrix;
 class CBC_CommonBitArray;
-class CBC_Detector;
-class CBC_Detector : public CFX_Object
+class CBC_Detector
 {
 public:
     CBC_Detector();
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417DetectorResult.h b/xfa/src/fxbarcode/pdf417/BC_PDF417DetectorResult.h
index ba557f1541..dabffe4c07 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417DetectorResult.h
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417DetectorResult.h
@@ -7,8 +7,7 @@
 #ifndef _BC_PDF417DETECTORRESULT_H_
 #define _BC_PDF417DETECTORRESULT_H_
 class CBC_CommonBitMatrix;
-class CBC_PDF417DetectorResult;
-class CBC_PDF417DetectorResult : public CFX_Object
+class CBC_PDF417DetectorResult
 {
 public:
     CBC_PDF417DetectorResult(CBC_CommonBitMatrix* bits, CFX_PtrArray* points);
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417Dimensions.h b/xfa/src/fxbarcode/pdf417/BC_PDF417Dimensions.h
index 6f8eaffed7..b8e9763081 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417Dimensions.h
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417Dimensions.h
@@ -6,8 +6,7 @@
 
 #ifndef _BC_DIMENSIONS_H_
 #define _BC_DIMENSIONS_H_
-class CBC_Dimensions;
-class CBC_Dimensions : public CFX_Object
+class CBC_Dimensions
 {
 public:
     CBC_Dimensions(FX_INT32 minCols, FX_INT32 maxCols, FX_INT32 minRows, FX_INT32 maxRows);
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417ECErrorCorrection.h b/xfa/src/fxbarcode/pdf417/BC_PDF417ECErrorCorrection.h
index 4ce8eda7d6..0fca2e6c39 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417ECErrorCorrection.h
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417ECErrorCorrection.h
@@ -8,8 +8,7 @@
 #define _BC_PDF417ECERRORCORRECTION_H_
 class CBC_PDF417ECModulusGF;
 class CBC_PDF417ECModulusPoly;
-class CBC_PDF417ECErrorCorrection;
-class CBC_PDF417ECErrorCorrection : public CFX_Object
+class CBC_PDF417ECErrorCorrection
 {
 public:
     CBC_PDF417ECErrorCorrection();
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusGF.h b/xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusGF.h
index 7ebe33ecfd..fbb79e3586 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusGF.h
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusGF.h
@@ -8,8 +8,7 @@
 #define _BC_PDF417ECMODULUSGF_H_
 class CBC_PDF417ECModulusPoly;
 class CBC_PDF417Common;
-class CBC_PDF417ECModulusGF;
-class CBC_PDF417ECModulusGF : public CFX_Object
+class CBC_PDF417ECModulusGF
 {
 public:
     CBC_PDF417ECModulusGF(FX_INT32 modulus, FX_INT32 generator, FX_INT32 &e);
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusPoly.h b/xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusPoly.h
index 9a9d6c16f2..172cc76cc8 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusPoly.h
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusPoly.h
@@ -7,8 +7,7 @@
 #ifndef _BC_PDF417ECMODULUSPOLY_H_
 #define _BC_PDF417ECMODULUSPOLY_H_
 class CBC_PDF417ECModulusGF;
-class CBC_PDF417ECModulusPoly;
-class CBC_PDF417ECModulusPoly : public CFX_Object
+class CBC_PDF417ECModulusPoly
 {
 public:
     CBC_PDF417ECModulusPoly(CBC_PDF417ECModulusGF* field, CFX_Int32Array &coefficients, FX_INT32 &e);
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417ErrorCorrection.h b/xfa/src/fxbarcode/pdf417/BC_PDF417ErrorCorrection.h
index 4e3aee8d26..9af8b72f17 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417ErrorCorrection.h
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417ErrorCorrection.h
@@ -6,8 +6,7 @@
 
 #ifndef _BC_PDF417ERRORCORRECTION_H_
 #define _BC_PDF417ERRORCORRECTION_H_
-class CBC_PDF417ErrorCorrection;
-class CBC_PDF417ErrorCorrection : public CFX_Object
+class CBC_PDF417ErrorCorrection
 {
 public:
     CBC_PDF417ErrorCorrection();
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417HighLevelEncoder.h b/xfa/src/fxbarcode/pdf417/BC_PDF417HighLevelEncoder.h
index ed962030ac..7c8801cb21 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417HighLevelEncoder.h
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417HighLevelEncoder.h
@@ -9,7 +9,7 @@
 
 #include "BC_PDF417Compaction.h"
 
-class CBC_PDF417HighLevelEncoder : public CFX_Object
+class CBC_PDF417HighLevelEncoder
 {
 public:
     static CFX_WideString encodeHighLevel(CFX_WideString msg, Compaction compaction, FX_INT32 &e);
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417ResultMetadata.h b/xfa/src/fxbarcode/pdf417/BC_PDF417ResultMetadata.h
index e6c7780304..7639c032ba 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417ResultMetadata.h
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417ResultMetadata.h
@@ -6,8 +6,7 @@
 
 #ifndef _BC_PDF417READER_H_
 #define _BC_PDF417READER_H_
-class CBC_PDF417ResultMetadata;
-class CBC_PDF417ResultMetadata : public CFX_Object
+class CBC_PDF417ResultMetadata
 {
 public:
     CBC_PDF417ResultMetadata();
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417ScanningDecoder.h b/xfa/src/fxbarcode/pdf417/BC_PDF417ScanningDecoder.h
index 924e5f798a..8cb5d2856c 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417ScanningDecoder.h
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417ScanningDecoder.h
@@ -16,8 +16,8 @@ class CBC_BarcodeMetadata;
 class CBC_BarcodeValue;
 class CBC_DetectionResult;
 class CBC_DetectionResultRowIndicatorColumn;
-class CBC_PDF417ScanningDecoder;
-class CBC_PDF417ScanningDecoder  : public CFX_Object
+
+class CBC_PDF417ScanningDecoder
 {
 public:
     CBC_PDF417ScanningDecoder();
-- 
cgit v1.2.3