XFA: Actually fix all relative includes to third_party.

R=tsepez@chromium.org

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

10 files changed, 71 insertions, 42 deletions

diff --git a/xfa/src/fxbarcode/BC_TwoDimWriter.h b/xfa/src/fxbarcode/BC_TwoDimWriter.h
index 1afe59fb00..6a9866bd51 100644
--- a/xfa/src/fxbarcode/BC_TwoDimWriter.h
+++ b/xfa/src/fxbarcode/BC_TwoDimWriter.h
@@ -4,12 +4,13 @@
 

 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com

 

-#ifndef _BC_TWODIMWRITER_H_

-#define _BC_TWODIMWRITER_H_

-#include "BC_Writer.h"

-class CBC_Writer;

+#ifndef XFA_SRC_FXBARCODE_BC_TWODIMWRITER_H_

+#define XFA_SRC_FXBARCODE_BC_TWODIMWRITER_H_

+

+#include "xfa/src/fxbarcode/BC_Writer.h"

+

 class CBC_CommonBitMatrix;

-class CBC_TwoDimWriter;

+

 class CBC_TwoDimWriter : public CBC_Writer {

  public:

   CBC_TwoDimWriter();

@@ -19,7 +20,7 @@ class CBC_TwoDimWriter : public CBC_Writer {
                           int32_t& outWidth,

                           int32_t& outHeight,

                           int32_t& e) {

-    return NULL;

+    return nullptr;

   };

   virtual uint8_t* Encode(const CFX_ByteString& contents,

                           BCFORMAT format,

@@ -27,14 +28,14 @@ class CBC_TwoDimWriter : public CBC_Writer {
                           int32_t& outHeight,

                           int32_t hints,

                           int32_t& e) {

-    return NULL;

+    return nullptr;

   };

   virtual uint8_t* Encode(const CFX_ByteString& contents,

                           BCFORMAT format,

                           int32_t& outWidth,

                           int32_t& outHeight,

                           int32_t& e) {

-    return NULL;

+    return nullptr;

   };

   virtual void RenderResult(uint8_t* code,

                             int32_t codeWidth,

@@ -51,4 +52,5 @@ class CBC_TwoDimWriter : public CBC_Writer {
   FX_BOOL m_bFixedSize;

   CBC_CommonBitMatrix* m_output;

 };

-#endif

+

+#endif  // XFA_SRC_FXBARCODE_BC_TWODIMWRITER_H_

diff --git a/xfa/src/fxbarcode/BC_Writer.h b/xfa/src/fxbarcode/BC_Writer.h
index 5684096925..b895b81ae4 100644
--- a/xfa/src/fxbarcode/BC_Writer.h
+++ b/xfa/src/fxbarcode/BC_Writer.h
@@ -4,9 +4,13 @@
 

 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com

 

-#ifndef _BC_WRITER_H_

-#define _BC_WRITER_H_

-class CBC_Writer;

+#ifndef XFA_SRC_FXBARCODE_BC_WRITER_H_

+#define XFA_SRC_FXBARCODE_BC_WRITER_H_

+

+#include "core/include/fxcrt/fx_string.h"

+#include "core/include/fxge/fx_dib.h"

+#include "xfa/src/fxbarcode/utils.h"

+

 class CBC_Writer {

  public:

   CBC_Writer();

@@ -41,4 +45,5 @@ class CBC_Writer {
   FX_ARGB m_barColor;

   FX_ARGB m_backgroundColor;

 };

-#endif

+

+#endif  // XFA_SRC_FXBARCODE_BC_WRITER_H_

diff --git a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixWriter.h b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixWriter.h
index 5ef124fc8f..808e35f11f 100644
--- a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixWriter.h
+++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixWriter.h
@@ -4,15 +4,15 @@
 

 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com

 

-#ifndef _BC_DATAMATRIXWRITER_H_

-#define _BC_DATAMATRIXWRITER_H_

+#ifndef XFA_SRC_FXBARCODE_DATAMATRIX_BC_DATAMATRIXWRITER_H_

+#define XFA_SRC_FXBARCODE_DATAMATRIX_BC_DATAMATRIXWRITER_H_

+

+#include "xfa/src/fxbarcode/BC_TwoDimWriter.h"

+

 class CBC_CommonByteMatrix;

-class CBC_CommonBitMatrix;

 class CBC_DefaultPlacement;

-class CBC_SymbolShapeHint;

 class CBC_SymbolInfo;

-class CBC_TwoDimWriter;

-class CBC_DataMatrixWriter;

+

 class CBC_DataMatrixWriter : public CBC_TwoDimWriter {

  public:

   CBC_DataMatrixWriter();

@@ -40,4 +40,5 @@ class CBC_DataMatrixWriter : public CBC_TwoDimWriter {
                                               int32_t& e);

   int32_t m_iCorrectLevel;

 };

-#endif

+

+#endif  // XFA_SRC_FXBARCODE_DATAMATRIX_BC_DATAMATRIXWRITER_H_

diff --git a/xfa/src/fxbarcode/oned/BC_OneDimWriter.cpp b/xfa/src/fxbarcode/oned/BC_OneDimWriter.cpp
index 11d1021aa2..04279f80b7 100644
--- a/xfa/src/fxbarcode/oned/BC_OneDimWriter.cpp
+++ b/xfa/src/fxbarcode/oned/BC_OneDimWriter.cpp
@@ -20,11 +20,13 @@
  * limitations under the License.

  */

 

-#include "../../../../third_party/base/nonstd_unique_ptr.h"

-#include "../barcode.h"

+#include "BC_OneDimWriter.h"

+

 #include "../BC_Writer.h"

+#include "../barcode.h"

 #include "../common/BC_CommonBitMatrix.h"

-#include "BC_OneDimWriter.h"

+#include "third_party/base/nonstd_unique_ptr.h"

+

 CBC_OneDimWriter::CBC_OneDimWriter() {

   m_locTextLoc = BC_TEXT_LOC_BELOWEMBED;

   m_bPrintChecksum = TRUE;

diff --git a/xfa/src/fxbarcode/oned/BC_OneDimWriter.h b/xfa/src/fxbarcode/oned/BC_OneDimWriter.h
index 0645b406cc..2222021c0f 100644
--- a/xfa/src/fxbarcode/oned/BC_OneDimWriter.h
+++ b/xfa/src/fxbarcode/oned/BC_OneDimWriter.h
@@ -4,11 +4,17 @@
 

 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com

 

-#ifndef _BC_ONEDIMWRITER_H_

-#define _BC_ONEDIMWRITER_H_

-class CBC_Writer;

+#ifndef XFA_SRC_FXBARCODE_ONED_BC_ONEDIMWRITER_H_

+#define XFA_SRC_FXBARCODE_ONED_BC_ONEDIMWRITER_H_

+

+#include "core/include/fxge/fx_ge.h"

+#include "xfa/include/fxbarcode/BC_BarCode.h"

+#include "xfa/src/fxbarcode/BC_Writer.h"

+

 class CBC_CommonBitMatrix;

-class CBC_OneDimWriter;

+class CFX_Font;

+class CFX_RenderDevice;

+

 class CBC_OneDimWriter : public CBC_Writer {

  public:

   CBC_OneDimWriter();

@@ -110,4 +116,5 @@ class CBC_OneDimWriter : public CBC_Writer {
                         int32_t& e);

   FX_WCHAR Upper(FX_WCHAR ch);

 };

-#endif

+

+#endif  // XFA_SRC_FXBARCODE_ONED_BC_ONEDIMWRITER_H_

diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.cpp
index e14b2b37c4..af63d19bfe 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.cpp
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.cpp
@@ -20,13 +20,16 @@
  * limitations under the License.

  */

 

+#include "BC_PDF417DecodedBitStreamParser.h"

+

 #include <stdlib.h>

-#include "../barcode.h"

+

 #include "../BC_DecoderResult.h"

+#include "../barcode.h"

 #include "../common/BC_CommonDecoderResult.h"

-#include "../../../../third_party/bigint/BigIntegerLibrary.hh"

 #include "BC_PDF417ResultMetadata.h"

-#include "BC_PDF417DecodedBitStreamParser.h"

+#include "third_party/bigint/BigIntegerLibrary.hh"

+

 #define TEXT_COMPACTION_MODE_LATCH 900

 #define BYTE_COMPACTION_MODE_LATCH 901

 #define NUMERIC_COMPACTION_MODE_LATCH 902

diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.h b/xfa/src/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.h
index f60d3eb929..6779f938d9 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.h
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.h
@@ -4,10 +4,15 @@
 

 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com

 

-#ifndef _BC_DECODEDBITSTREAMPARSER_H_

-#define _BC_DECODEDBITSTREAMPARSER_H_

+#ifndef XFA_SRC_FXBARCODE_PDF417_BC_PDF417DECODEDBITSTREAMPARSER_H_

+#define XFA_SRC_FXBARCODE_PDF417_BC_PDF417DECODEDBITSTREAMPARSER_H_

+

+#include "core/include/fxcrt/fx_basic.h"

+#include "core/include/fxcrt/fx_string.h"

+

 class CBC_CommonDecoderResult;

 class CBC_PDF417ResultMetadata;

+

 class CBC_DecodedBitStreamPaser {

  public:

   CBC_DecodedBitStreamPaser();

@@ -54,4 +59,4 @@ class CBC_DecodedBitStreamPaser {
                                               int32_t count,

                                               int32_t& e);

 };

-#endif

+#endif  // XFA_SRC_FXBARCODE_PDF417_BC_PDF417DECODEDBITSTREAMPARSER_H_

diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417HighLevelEncoder.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417HighLevelEncoder.cpp
index db321bc846..6a8beaab20 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417HighLevelEncoder.cpp
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417HighLevelEncoder.cpp
@@ -20,11 +20,13 @@
  * limitations under the License.

  */

 

-#include "../barcode.h"

+#include "BC_PDF417HighLevelEncoder.h"

+

 #include "../BC_UtilCodingConvert.h"

-#include "../../../../third_party/bigint/BigIntegerLibrary.hh"

+#include "../barcode.h"

 #include "BC_PDF417Compaction.h"

-#include "BC_PDF417HighLevelEncoder.h"

+#include "third_party/bigint/BigIntegerLibrary.hh"

+

 #define SUBMODE_ALPHA 0

 #define SUBMODE_LOWER 1

 #define SUBMODE_MIXED 2

diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417HighLevelEncoder.h b/xfa/src/fxbarcode/pdf417/BC_PDF417HighLevelEncoder.h
index e11f0a5632..14e1c7270c 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417HighLevelEncoder.h
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417HighLevelEncoder.h
@@ -4,10 +4,12 @@
 

 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com

 

-#ifndef _BC_PDF417HIGHLEVELENCODER_H_

-#define _BC_PDF417HIGHLEVELENCODER_H_

+#ifndef XFA_SRC_FXBARCODE_PDF417_BC_PDF417HIGHLEVELENCODER_H_

+#define XFA_SRC_FXBARCODE_PDF417_BC_PDF417HIGHLEVELENCODER_H_

 

-#include "BC_PDF417Compaction.h"

+#include "core/include/fxcrt/fx_basic.h"

+#include "core/include/fxcrt/fx_string.h"

+#include "xfa/src/fxbarcode/pdf417/BC_PDF417Compaction.h"

 

 class CBC_PDF417HighLevelEncoder {

  public:

@@ -69,4 +71,4 @@ class CBC_PDF417HighLevelEncoder {
   friend class PDF417HighLevelEncoder_ConsecutiveBinaryCount_Test;

 };

 

-#endif

+#endif  // XFA_SRC_FXBARCODE_PDF417_BC_PDF417HIGHLEVELENCODER_H_

diff --git a/xfa/src/fxgraphics/src/fx_graphics.cpp b/xfa/src/fxgraphics/src/fx_graphics.cpp
index df0ecbba22..655c87085b 100644
--- a/xfa/src/fxgraphics/src/fx_graphics.cpp
+++ b/xfa/src/fxgraphics/src/fx_graphics.cpp
@@ -4,9 +4,9 @@
 

 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com

 

-#include "../../../../third_party/base/nonstd_unique_ptr.h"

 #include "fx_path_generator.h"

 #include "pre.h"

+#include "third_party/base/nonstd_unique_ptr.h"

 

 class CAGG_Graphics {

  public: