Remove fgas_base.h and IWYU

R=tsepez@chromium.org

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

29 files changed, 48 insertions, 43 deletions

diff --git a/BUILD.gn b/BUILD.gn
index f6c682ae64..4b603415d9 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -921,7 +921,6 @@ if (pdf_enable_xfa) {
       "xfa/src/fgas/src/crt/fx_system.cpp",
       "xfa/src/fgas/src/crt/fx_utils.cpp",
       "xfa/src/fgas/src/crt/fx_utils.h",
-      "xfa/src/fgas/src/fgas_base.h",
       "xfa/src/fgas/src/font/fx_fontutils.cpp",
       "xfa/src/fgas/src/font/fx_fontutils.h",
       "xfa/src/fgas/src/font/fx_gefont.cpp",
diff --git a/core/include/fxcrt/fx_ucd.h b/core/include/fxcrt/fx_ucd.h
index e091f8bd8a..a670640306 100644
--- a/core/include/fxcrt/fx_ucd.h
+++ b/core/include/fxcrt/fx_ucd.h
@@ -11,6 +11,7 @@
 
 #define FX_BIDICLASSBITS 6
 #define FX_BIDICLASSBITSMASK (31 << FX_BIDICLASSBITS)
+
 enum FX_BIDICLASS {
   FX_BIDICLASS_ON = 0,    // Other Neutral
   FX_BIDICLASS_L = 1,     // Left Letter
diff --git a/xfa.gyp b/xfa.gyp
index 51622d89c8..c19ec8a25f 100644
--- a/xfa.gyp
+++ b/xfa.gyp
@@ -170,7 +170,6 @@
         "xfa/src/fgas/src/crt/fx_system.cpp",
         "xfa/src/fgas/src/crt/fx_utils.cpp",
         "xfa/src/fgas/src/crt/fx_utils.h",
-        "xfa/src/fgas/src/fgas_base.h",
         "xfa/src/fgas/src/font/fx_fontutils.cpp",
         "xfa/src/fgas/src/font/fx_fontutils.h",
         "xfa/src/fgas/src/font/fx_gefont.cpp",
diff --git a/xfa/src/fgas/include/fx_rbk.h b/xfa/src/fgas/include/fx_rbk.h
index c655111f9c..043361b0a3 100644
--- a/xfa/src/fgas/include/fx_rbk.h
+++ b/xfa/src/fgas/include/fx_rbk.h
@@ -9,7 +9,10 @@
 
 #include "core/include/fxcrt/fx_ucd.h"
 #include "core/include/fxge/fx_ge.h"
+#include "xfa/src/fgas/include/fx_mem.h"
+#include "xfa/src/fgas/include/fx_tbk.h"
 #include "xfa/src/fgas/include/fx_ucd.h"
+#include "xfa/src/fgas/include/fx_utl.h"
 
 class IFX_Unknown;
 class IFX_Font;
diff --git a/xfa/src/fgas/include/fx_ucd.h b/xfa/src/fgas/include/fx_ucd.h
index ae1c882e94..1d86562473 100644
--- a/xfa/src/fgas/include/fx_ucd.h
+++ b/xfa/src/fgas/include/fx_ucd.h
@@ -7,6 +7,8 @@
 #ifndef XFA_SRC_FGAS_INCLUDE_FX_UCD_H_
 #define XFA_SRC_FGAS_INCLUDE_FX_UCD_H_
 
+#include "xfa/src/fgas/include/fx_fnt.h"
+
 #define FX_JAPCHARPROPERTYEX_Left 0x01
 #define FX_JAPCHARPROPERTYEX_Center 0x02
 #define FX_JAPCHARPROPERTYEX_Right 0x03
diff --git a/xfa/src/fgas/src/crt/fx_algorithm.cpp b/xfa/src/fgas/src/crt/fx_algorithm.cpp
index 7a6cae8727..3d1f58a9e7 100644
--- a/xfa/src/fgas/src/crt/fx_algorithm.cpp
+++ b/xfa/src/fgas/src/crt/fx_algorithm.cpp
@@ -4,10 +4,12 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/src/fgas/src/fgas_base.h"
+#include "core/include/fxcrt/fx_basic.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
+
 const static FX_CHAR g_FXBase64EncoderMap[64] = {
     'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M',
     'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
diff --git a/xfa/src/fgas/src/crt/fx_codepage.cpp b/xfa/src/fgas/src/crt/fx_codepage.cpp
index 7cf82121d3..0928d005ff 100644
--- a/xfa/src/fgas/src/crt/fx_codepage.cpp
+++ b/xfa/src/fgas/src/crt/fx_codepage.cpp
@@ -4,9 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
+#include "core/include/fxcrt/fx_ext.h"
 #include "xfa/src/fgas/include/fx_cpg.h"
 #include "xfa/src/fgas/include/fx_lgg.h"
-#include "xfa/src/fgas/src/fgas_base.h"
 
 static const FX_CHARSET_MAP g_FXCharset2CodePageTable[] = {
     {0, 1252},   {1, 0},      {2, 42},     {77, 10000}, {78, 10001},
diff --git a/xfa/src/fgas/src/crt/fx_encode.cpp b/xfa/src/fgas/src/crt/fx_encode.cpp
index 8d225047ec..79be09819a 100644
--- a/xfa/src/fgas/src/crt/fx_encode.cpp
+++ b/xfa/src/fgas/src/crt/fx_encode.cpp
@@ -5,7 +5,6 @@
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "xfa/src/fgas/include/fx_cpg.h"
-#include "xfa/src/fgas/src/fgas_base.h"
 
 void FX_SwapByteOrder(FX_WCHAR* pStr, int32_t iLength) {
   FXSYS_assert(pStr != NULL);
diff --git a/xfa/src/fgas/src/crt/fx_memory.cpp b/xfa/src/fgas/src/crt/fx_memory.cpp
index 1b61616b6e..5c14a9430c 100644
--- a/xfa/src/fgas/src/crt/fx_memory.cpp
+++ b/xfa/src/fgas/src/crt/fx_memory.cpp
@@ -4,11 +4,12 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
+#include "xfa/src/fgas/src/crt/fx_memory.h"
+
 #include <algorithm>
 
-#include "xfa/src/fgas/src/crt/fx_memory.h"
-#include "xfa/src/fgas/src/fgas_base.h"
 #define FX_4BYTEALIGN(size) (((size) + 3) / 4 * 4)
+
 IFX_MEMAllocator* FX_CreateAllocator(FX_ALLOCTYPE eType,
                                      size_t chunkSize,
                                      size_t blockSize) {
diff --git a/xfa/src/fgas/src/crt/fx_stream.cpp b/xfa/src/fgas/src/crt/fx_stream.cpp
index cca0cb275d..e5bf3ef8ba 100644
--- a/xfa/src/fgas/src/crt/fx_stream.cpp
+++ b/xfa/src/fgas/src/crt/fx_stream.cpp
@@ -10,7 +10,6 @@
 
 #include "xfa/src/fgas/include/fx_cpg.h"
 #include "xfa/src/fgas/include/fx_sys.h"
-#include "xfa/src/fgas/src/fgas_base.h"
 
 IFX_Stream* IFX_Stream::CreateStream(IFX_BufferRead* pBufferRead,
                                      FX_DWORD dwAccess,
diff --git a/xfa/src/fgas/src/crt/fx_system.cpp b/xfa/src/fgas/src/crt/fx_system.cpp
index cfac8bfcd7..43cccba20a 100644
--- a/xfa/src/fgas/src/crt/fx_system.cpp
+++ b/xfa/src/fgas/src/crt/fx_system.cpp
@@ -6,7 +6,8 @@
 
 #include <algorithm>
 
-#include "xfa/src/fgas/src/fgas_base.h"
+#include "core/include/fxcrt/fx_system.h"
+
 #if _FX_OS_ == _FX_WIN32_DESKTOP_ || _FX_OS_ == _FX_WIN32_MOBILE_ || \
     _FX_OS_ == _FX_WIN64_
 #include <io.h>
diff --git a/xfa/src/fgas/src/crt/fx_utils.cpp b/xfa/src/fgas/src/crt/fx_utils.cpp
index 3740178d87..382f64649f 100644
--- a/xfa/src/fgas/src/crt/fx_utils.cpp
+++ b/xfa/src/fgas/src/crt/fx_utils.cpp
@@ -4,11 +4,11 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
+#include "xfa/src/fgas/src/crt/fx_utils.h"
+
 #include <algorithm>
 
 #include "xfa/src/fgas/include/fx_utl.h"
-#include "xfa/src/fgas/src/crt/fx_utils.h"
-#include "xfa/src/fgas/src/fgas_base.h"
 
 class FX_BASEARRAYDATA : public CFX_Target {
  public:
diff --git a/xfa/src/fgas/src/crt/fx_utils.h b/xfa/src/fgas/src/crt/fx_utils.h
index e491ec024f..3683e5a821 100644
--- a/xfa/src/fgas/src/crt/fx_utils.h
+++ b/xfa/src/fgas/src/crt/fx_utils.h
@@ -7,6 +7,9 @@
 #ifndef XFA_SRC_FGAS_SRC_CRT_FX_UTILS_H_
 #define XFA_SRC_FGAS_SRC_CRT_FX_UTILS_H_
 
+#include "core/include/fxcrt/fx_basic.h"
+#include "xfa/src/fgas/include/fx_mem.h"
+
 class CFX_BaseMassArrayImp : public CFX_Target {
  public:
   CFX_BaseMassArrayImp(int32_t iChunkSize, int32_t iBlockSize);
diff --git a/xfa/src/fgas/src/fgas_base.h b/xfa/src/fgas/src/fgas_base.h
deleted file mode 100644
index 28356acca3..0000000000
--- a/xfa/src/fgas/src/fgas_base.h
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-// TODO(thestig): Remove this file and do IWYU.
-
-#ifndef XFA_SRC_FGAS_SRC_FGAS_BASE_H_
-#define XFA_SRC_FGAS_SRC_FGAS_BASE_H_
-
-#include "core/include/fxge/fx_freetype.h"
-#include "xfa/src/foxitlib.h"
-
-#endif  // XFA_SRC_FGAS_SRC_FGAS_BASE_H_
diff --git a/xfa/src/fgas/src/font/fx_fontutils.cpp b/xfa/src/fgas/src/font/fx_fontutils.cpp
index 0f569d2055..5499994eef 100644
--- a/xfa/src/fgas/src/font/fx_fontutils.cpp
+++ b/xfa/src/fgas/src/font/fx_fontutils.cpp
@@ -4,8 +4,11 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/src/fgas/src/fgas_base.h"
 #include "xfa/src/fgas/src/font/fx_fontutils.h"
+
+#include "core/include/fxcrt/fx_ext.h"
+#include "xfa/src/fgas/include/fx_fnt.h"
+
 FX_DWORD FGAS_GetFontHashCode(FX_WORD wCodePage, FX_DWORD dwFontStyles) {
   FX_DWORD dwHash = wCodePage;
   if (dwFontStyles & FX_FONTSTYLE_FixedPitch) {
diff --git a/xfa/src/fgas/src/font/fx_fontutils.h b/xfa/src/fgas/src/font/fx_fontutils.h
index d122c1df42..ec14686c8e 100644
--- a/xfa/src/fgas/src/font/fx_fontutils.h
+++ b/xfa/src/fgas/src/font/fx_fontutils.h
@@ -7,6 +7,8 @@
 #ifndef XFA_SRC_FGAS_SRC_FONT_FX_FONTUTILS_H_
 #define XFA_SRC_FGAS_SRC_FONT_FX_FONTUTILS_H_
 
+#include "core/include/fxcrt/fx_string.h"
+
 struct FGAS_FONTUSB {
   FX_WCHAR wStartUnicode;
   FX_WCHAR wEndUnicode;
diff --git a/xfa/src/fgas/src/font/fx_gefont.cpp b/xfa/src/fgas/src/font/fx_gefont.cpp
index e71d83e12e..37066a2a49 100644
--- a/xfa/src/fgas/src/font/fx_gefont.cpp
+++ b/xfa/src/fgas/src/font/fx_gefont.cpp
@@ -7,7 +7,6 @@
 #include "xfa/src/fgas/src/font/fx_gefont.h"
 
 #include "xfa/src/fgas/include/fx_cpg.h"
-#include "xfa/src/fgas/src/fgas_base.h"
 #include "xfa/src/fgas/src/font/fx_fontutils.h"
 
 IFX_Font* IFX_Font::LoadFont(const FX_WCHAR* pszFontFamily,
diff --git a/xfa/src/fgas/src/font/fx_stdfontmgr.cpp b/xfa/src/fgas/src/font/fx_stdfontmgr.cpp
index a8fab8817c..b363ccbdd7 100644
--- a/xfa/src/fgas/src/font/fx_stdfontmgr.cpp
+++ b/xfa/src/fgas/src/font/fx_stdfontmgr.cpp
@@ -8,7 +8,6 @@
 
 #include "core/include/fxcrt/fx_stream.h"
 #include "xfa/src/fgas/include/fx_cpg.h"
-#include "xfa/src/fgas/src/fgas_base.h"
 #include "xfa/src/fgas/src/font/fx_fontutils.h"
 
 #if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
diff --git a/xfa/src/fgas/src/font/fx_stdfontmgr.h b/xfa/src/fgas/src/font/fx_stdfontmgr.h
index de0291e2ef..1314d2f465 100644
--- a/xfa/src/fgas/src/font/fx_stdfontmgr.h
+++ b/xfa/src/fgas/src/font/fx_stdfontmgr.h
@@ -7,6 +7,10 @@
 #ifndef XFA_SRC_FGAS_SRC_FONT_FX_STDFONTMGR_H_
 #define XFA_SRC_FGAS_SRC_FONT_FX_STDFONTMGR_H_
 
+#include "core/include/fxcrt/fx_ext.h"
+#include "core/include/fxge/fx_freetype.h"
+#include "core/include/fxge/fx_ge.h"
+#include "third_party/freetype/include/freetype/fttypes.h"
 #include "xfa/src/fgas/include/fx_fnt.h"
 
 #if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
diff --git a/xfa/src/fgas/src/layout/fx_linebreak.cpp b/xfa/src/fgas/src/layout/fx_linebreak.cpp
index 7bceaf361e..ed3c1b57f3 100644
--- a/xfa/src/fgas/src/layout/fx_linebreak.cpp
+++ b/xfa/src/fgas/src/layout/fx_linebreak.cpp
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
+#include "core/include/fxcrt/fx_ucd.h"
 #include "xfa/src/fgas/include/fx_lbk.h"
-#include "xfa/src/fgas/src/fgas_base.h"
 
 const FX_LINEBREAKTYPE gs_FX_LineBreak_PairTable[64][32] = {
     {FX_LBPB, FX_LBPB, FX_LBPB, FX_LBPB, FX_LBPB, FX_LBPB, FX_LBPB, FX_LBPB,
diff --git a/xfa/src/fgas/src/layout/fx_rtfbreak.cpp b/xfa/src/fgas/src/layout/fx_rtfbreak.cpp
index d76b76d3f1..4b17615e07 100644
--- a/xfa/src/fgas/src/layout/fx_rtfbreak.cpp
+++ b/xfa/src/fgas/src/layout/fx_rtfbreak.cpp
@@ -4,11 +4,11 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
+#include "xfa/src/fgas/src/layout/fx_rtfbreak.h"
+
 #include <algorithm>
 
 #include "xfa/src/fgas/include/fx_lbk.h"
-#include "xfa/src/fgas/src/fgas_base.h"
-#include "xfa/src/fgas/src/layout/fx_rtfbreak.h"
 #include "xfa/src/fgas/src/layout/fx_unicode.h"
 
 IFX_RTFBreak* IFX_RTFBreak::Create(FX_DWORD dwPolicies) {
diff --git a/xfa/src/fgas/src/layout/fx_textbreak.cpp b/xfa/src/fgas/src/layout/fx_textbreak.cpp
index d3ea85ebd0..6263463bd4 100644
--- a/xfa/src/fgas/src/layout/fx_textbreak.cpp
+++ b/xfa/src/fgas/src/layout/fx_textbreak.cpp
@@ -4,12 +4,12 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
+#include "xfa/src/fgas/src/layout/fx_textbreak.h"
+
 #include <algorithm>
 
 #include "core/include/fxcrt/fx_arb.h"
 #include "xfa/src/fgas/include/fx_lbk.h"
-#include "xfa/src/fgas/src/fgas_base.h"
-#include "xfa/src/fgas/src/layout/fx_textbreak.h"
 #include "xfa/src/fgas/src/layout/fx_unicode.h"
 
 extern const FX_LINEBREAKTYPE gs_FX_LineBreak_PairTable[64][32];
diff --git a/xfa/src/fgas/src/layout/fx_textbreak.h b/xfa/src/fgas/src/layout/fx_textbreak.h
index 670b86c00b..fa15afd76a 100644
--- a/xfa/src/fgas/src/layout/fx_textbreak.h
+++ b/xfa/src/fgas/src/layout/fx_textbreak.h
@@ -7,7 +7,9 @@
 #ifndef XFA_SRC_FGAS_SRC_LAYOUT_FX_TEXTBREAK_H_
 #define XFA_SRC_FGAS_SRC_LAYOUT_FX_TEXTBREAK_H_
 
+#include "core/include/fxcrt/fx_ucd.h"
 #include "core/include/fxcrt/fx_memory.h"
+#include "xfa/src/fgas/include/fx_tbk.h"
 #include "xfa/src/fgas/src/layout/fx_unicode.h"
 
 class IFX_ArabicChar;
diff --git a/xfa/src/fgas/src/layout/fx_unicode.cpp b/xfa/src/fgas/src/layout/fx_unicode.cpp
index a93edc15f7..8b9546e051 100644
--- a/xfa/src/fgas/src/layout/fx_unicode.cpp
+++ b/xfa/src/fgas/src/layout/fx_unicode.cpp
@@ -4,8 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/src/fgas/src/fgas_base.h"
 #include "xfa/src/fgas/src/layout/fx_unicode.h"
+
+#include "xfa/src/fgas/include/fx_ucd.h"
+
 void FX_TEXTLAYOUT_PieceSort(CFX_TPOArray& tpos, int32_t iStart, int32_t iEnd) {
   FXSYS_assert(iStart > -1 && iStart < tpos.GetSize());
   FXSYS_assert(iEnd > -1 && iEnd < tpos.GetSize());
diff --git a/xfa/src/fgas/src/layout/fx_unicode.h b/xfa/src/fgas/src/layout/fx_unicode.h
index 70652e40f0..0b119dec1c 100644
--- a/xfa/src/fgas/src/layout/fx_unicode.h
+++ b/xfa/src/fgas/src/layout/fx_unicode.h
@@ -7,6 +7,8 @@
 #ifndef XFA_SRC_FGAS_SRC_LAYOUT_FX_UNICODE_H_
 #define XFA_SRC_FGAS_SRC_LAYOUT_FX_UNICODE_H_
 
+#include "xfa/src/fgas/include/fx_utl.h"
+
 struct FX_TPO {
   int32_t index;
   int32_t pos;
diff --git a/xfa/src/fgas/src/localization/fx_datetime.cpp b/xfa/src/fgas/src/localization/fx_datetime.cpp
index 7ea82af802..f537646d45 100644
--- a/xfa/src/fgas/src/localization/fx_datetime.cpp
+++ b/xfa/src/fgas/src/localization/fx_datetime.cpp
@@ -4,10 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
+#include "core/include/fxcrt/fx_system.h"
 #include "xfa/src/fgas/include/fx_datetime.h"
 
-#include "xfa/src/fgas/src/fgas_base.h"
-
 #if _FX_OS_ == _FX_LINUX_DESKTOP_ || _FX_OS_ == _FX_ANDROID_ || \
     _FX_OS_ == _FX_MACOSX_ || _FX_OS_ == _FX_IOS_
 #include <sys/time.h>
diff --git a/xfa/src/fgas/src/localization/fx_locale.cpp b/xfa/src/fgas/src/localization/fx_locale.cpp
index fe9ec3f8dd..f8b2f9d1cb 100644
--- a/xfa/src/fgas/src/localization/fx_locale.cpp
+++ b/xfa/src/fgas/src/localization/fx_locale.cpp
@@ -6,8 +6,8 @@
 
 #include <algorithm>
 
+#include "core/include/fxcrt/fx_ext.h"
 #include "core/include/fxcrt/fx_xml.h"
-#include "xfa/src/fgas/src/fgas_base.h"
 #include "xfa/src/fgas/src/localization/fx_localeimp.h"
 
 #define FX_LOCALECATEGORY_DateHash 0xbde9abde
diff --git a/xfa/src/fgas/src/localization/fx_localemgr.cpp b/xfa/src/fgas/src/localization/fx_localemgr.cpp
index 656be0a494..49cc5068e2 100644
--- a/xfa/src/fgas/src/localization/fx_localemgr.cpp
+++ b/xfa/src/fgas/src/localization/fx_localemgr.cpp
@@ -4,10 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/include/fxcrt/fx_xml.h"
-#include "xfa/src/fgas/src/fgas_base.h"
 #include "xfa/src/fgas/src/localization/fx_localemgr.h"
 
+#include "core/include/fxcrt/fx_xml.h"
+
 IFX_LocaleMgr* FX_LocaleMgr_Create(const FX_WCHAR* pszLocalPath,
                                    FX_WORD wDefaultLCID) {
   void* pPathHandle = FX_OpenFolder(pszLocalPath);
diff --git a/xfa/src/fgas/src/xml/fx_sax_imp.cpp b/xfa/src/fgas/src/xml/fx_sax_imp.cpp
index 679df907f2..251af01a06 100644
--- a/xfa/src/fgas/src/xml/fx_sax_imp.cpp
+++ b/xfa/src/fgas/src/xml/fx_sax_imp.cpp
@@ -4,11 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include <algorithm>
-
-#include "xfa/src/fgas/src/fgas_base.h"
 #include "xfa/src/fgas/src/xml/fx_sax_imp.h"
 
+#include <algorithm>
+
 namespace {
 
 const FX_DWORD kSaxFileBufSize = 32768;