Remove foxitlib.h and foxitxfa.h and IWYU.

R=tsepez@chromium.org

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

17 files changed, 35 insertions, 22 deletions

diff --git a/xfa/src/fdp/include/fde_pth.h b/xfa/src/fdp/include/fde_pth.h
index 41cb367613..8f4cc9aeed 100644
--- a/xfa/src/fdp/include/fde_pth.h
+++ b/xfa/src/fdp/include/fde_pth.h
@@ -7,7 +7,9 @@
 #ifndef XFA_SRC_FDP_INCLUDE_FDE_PTH_H_
 #define XFA_SRC_FDP_INCLUDE_FDE_PTH_H_
 
-class IFDE_Path;
+#include "core/include/fxcrt/fx_coordinates.h"
+#include "core/include/fxcrt/fx_system.h"
+
 class IFDE_Path {
  public:
   static IFDE_Path* Create();
diff --git a/xfa/src/fdp/src/css/fde_csscache.cpp b/xfa/src/fdp/src/css/fde_csscache.cpp
index ca9e552dbf..4a9fb754d3 100644
--- a/xfa/src/fdp/src/css/fde_csscache.cpp
+++ b/xfa/src/fdp/src/css/fde_csscache.cpp
@@ -4,10 +4,11 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
+#include "xfa/src/fdp/src/css/fde_csscache.h"
+
 #include <algorithm>
 
-#include "xfa/src/fdp/src/css/fde_csscache.h"
-#include "xfa/src/foxitlib.h"
+#include "core/include/fxcrt/fx_ext.h"
 
 FDE_CSSCACHEITEM::FDE_CSSCACHEITEM(IFDE_CSSStyleSheet* p)
     : pStylesheet(p), dwActivity(0) {
diff --git a/xfa/src/fdp/src/css/fde_cssdatatable.cpp b/xfa/src/fdp/src/css/fde_cssdatatable.cpp
index 8284ea1b01..5b80d3ef6a 100644
--- a/xfa/src/fdp/src/css/fde_cssdatatable.cpp
+++ b/xfa/src/fdp/src/css/fde_cssdatatable.cpp
@@ -6,10 +6,10 @@
 
 #include "xfa/src/fdp/src/css/fde_cssdatatable.h"
 
+#include "core/include/fxcrt/fx_ext.h"
 #include "xfa/src/fgas/include/fx_alg.h"
 #include "xfa/src/fgas/include/fx_cpg.h"
 #include "xfa/src/fgas/include/fx_sys.h"
-#include "xfa/src/foxitlib.h"
 
 FX_BOOL FDE_CSSLengthToFloat(const FDE_CSSLENGTH& len,
                              FX_FLOAT fPercentBase,
diff --git a/xfa/src/fdp/src/css/fde_cssdeclaration.cpp b/xfa/src/fdp/src/css/fde_cssdeclaration.cpp
index 57b36daa82..4eea30c150 100644
--- a/xfa/src/fdp/src/css/fde_cssdeclaration.cpp
+++ b/xfa/src/fdp/src/css/fde_cssdeclaration.cpp
@@ -6,8 +6,8 @@
 
 #include "xfa/src/fdp/src/css/fde_cssdeclaration.h"
 
+#include "core/include/fxcrt/fx_ext.h"
 #include "xfa/src/fgas/include/fx_sys.h"
-#include "xfa/src/foxitlib.h"
 
 IFDE_CSSValue* CFDE_CSSDeclaration::GetProperty(FDE_CSSPROPERTY eProperty,
                                                 FX_BOOL& bImportant) const {
diff --git a/xfa/src/fdp/src/css/fde_cssstyleselector.cpp b/xfa/src/fdp/src/css/fde_cssstyleselector.cpp
index 5f51eb89b6..68bb570769 100644
--- a/xfa/src/fdp/src/css/fde_cssstyleselector.cpp
+++ b/xfa/src/fdp/src/css/fde_cssstyleselector.cpp
@@ -4,10 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
+#include "xfa/src/fdp/src/css/fde_cssstyleselector.h"
+
 #include "xfa/src/fdp/src/css/fde_csscache.h"
 #include "xfa/src/fdp/src/css/fde_cssdeclaration.h"
-#include "xfa/src/fdp/src/css/fde_cssstyleselector.h"
-#include "xfa/src/foxitlib.h"
 
 int32_t CFDE_CSSCounterStyle::FindIndex(const FX_WCHAR* pszIdentifier) {
   int32_t iCount = m_arrCounterData.GetSize();
diff --git a/xfa/src/fdp/src/css/fde_cssstyleselector.h b/xfa/src/fdp/src/css/fde_cssstyleselector.h
index aad5531de1..15a45c1d8a 100644
--- a/xfa/src/fdp/src/css/fde_cssstyleselector.h
+++ b/xfa/src/fdp/src/css/fde_cssstyleselector.h
@@ -9,6 +9,11 @@
 
 #include <vector>
 
+#include "core/include/fxcrt/fx_ext.h"
+#include "xfa/src/fdp/include/fde_css.h"
+#include "xfa/src/fdp/src/css/fde_csscache.h"
+#include "xfa/src/fdp/src/css/fde_cssdeclaration.h"
+#include "xfa/src/fgas/include/fx_mem.h"
 #include "xfa/src/fgas/include/fx_sys.h"
 
 #define FDE_CSSUNIVERSALHASH ('*')
diff --git a/xfa/src/fdp/src/css/fde_cssstylesheet.cpp b/xfa/src/fdp/src/css/fde_cssstylesheet.cpp
index b9ecd500a6..59fd83b7fe 100644
--- a/xfa/src/fdp/src/css/fde_cssstylesheet.cpp
+++ b/xfa/src/fdp/src/css/fde_cssstylesheet.cpp
@@ -9,7 +9,6 @@
 #include "xfa/src/fdp/src/css/fde_cssdatatable.h"
 #include "xfa/src/fdp/src/css/fde_csssyntax.h"
 #include "xfa/src/fgas/include/fx_cpg.h"
-#include "xfa/src/foxitlib.h"
 
 IFDE_CSSStyleSheet* IFDE_CSSStyleSheet::LoadHTMLStandardStyleSheet() {
   static const FX_WCHAR* s_pStyle =
diff --git a/xfa/src/fdp/src/css/fde_csssyntax.cpp b/xfa/src/fdp/src/css/fde_csssyntax.cpp
index e2724b2187..0ba7234633 100644
--- a/xfa/src/fdp/src/css/fde_csssyntax.cpp
+++ b/xfa/src/fdp/src/css/fde_csssyntax.cpp
@@ -8,7 +8,6 @@
 
 #include "xfa/src/fdp/src/css/fde_cssdatatable.h"
 #include "xfa/src/fgas/include/fx_cpg.h"
-#include "xfa/src/foxitlib.h"
 
 #ifdef _cplusplus
 extern "C" {
diff --git a/xfa/src/fdp/src/fde/fde_devbasic.cpp b/xfa/src/fdp/src/fde/fde_devbasic.cpp
index 6b0e13971e..fea0d6a4d1 100644
--- a/xfa/src/fdp/src/fde/fde_devbasic.cpp
+++ b/xfa/src/fdp/src/fde/fde_devbasic.cpp
@@ -4,10 +4,11 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
+#include "xfa/src/fdp/src/fde/fde_devbasic.h"
+
 #include <cstdint>
 
-#include "xfa/src/fdp/src/fde/fde_devbasic.h"
-#include "xfa/src/foxitlib.h"
+#include "xfa/src/fdp/include/fde_brs.h"
 
 static const FDE_HATCHDATA gs_HatchBitmapData[FDE_HATCHSTYLE_Total] = {
     {16,
diff --git a/xfa/src/fdp/src/fde/fde_gedevice.cpp b/xfa/src/fdp/src/fde/fde_gedevice.cpp
index 75201af133..b2be47c659 100644
--- a/xfa/src/fdp/src/fde/fde_gedevice.cpp
+++ b/xfa/src/fdp/src/fde/fde_gedevice.cpp
@@ -4,12 +4,15 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
+#include "xfa/src/fdp/src/fde/fde_gedevice.h"
+
 #include <algorithm>
 
+#include "xfa/src/fdp/include/fde_brs.h"
+#include "xfa/src/fdp/include/fde_img.h"
+#include "xfa/src/fdp/include/fde_pen.h"
 #include "xfa/src/fdp/src/fde/fde_devbasic.h"
-#include "xfa/src/fdp/src/fde/fde_gedevice.h"
 #include "xfa/src/fdp/src/fde/fde_geobject.h"
-#include "xfa/src/foxitlib.h"
 
 FX_BOOL FDE_GetStockHatchMask(int32_t iHatchStyle, CFX_DIBitmap& hatchMask) {
   FDE_LPCHATCHDATA pData = FDE_DEVGetHatchData(iHatchStyle);
diff --git a/xfa/src/fdp/src/fde/fde_geobject.cpp b/xfa/src/fdp/src/fde/fde_geobject.cpp
index ffe0ff0b9a..7e22691c5b 100644
--- a/xfa/src/fdp/src/fde/fde_geobject.cpp
+++ b/xfa/src/fdp/src/fde/fde_geobject.cpp
@@ -5,8 +5,8 @@
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "xfa/src/fdp/src/fde/fde_geobject.h"
+
 #include "xfa/src/fdp/src/fde/fde_object.h"
-#include "xfa/src/foxitlib.h"
 
 IFDE_Path* IFDE_Path::Create() {
   return new CFDE_Path;
diff --git a/xfa/src/fdp/src/fde/fde_geobject.h b/xfa/src/fdp/src/fde/fde_geobject.h
index a22817f183..aa5847cf8e 100644
--- a/xfa/src/fdp/src/fde/fde_geobject.h
+++ b/xfa/src/fdp/src/fde/fde_geobject.h
@@ -7,7 +7,9 @@
 #ifndef XFA_SRC_FDP_SRC_FDE_FDE_GEOBJECT_H_
 #define XFA_SRC_FDP_SRC_FDE_FDE_GEOBJECT_H_
 
-#include "xfa/src/foxitlib.h"
+#include "core/include/fxge/fx_ge.h"
+#include "xfa/src/fdp/include/fde_pth.h"
+#include "xfa/src/fgas/include/fx_mem.h"
 
 class CFDE_Path : public IFDE_Path, public CFX_Target {
  public:
diff --git a/xfa/src/fdp/src/fde/fde_iterator.cpp b/xfa/src/fdp/src/fde/fde_iterator.cpp
index e3134eb679..f79a41a001 100644
--- a/xfa/src/fdp/src/fde/fde_iterator.cpp
+++ b/xfa/src/fdp/src/fde/fde_iterator.cpp
@@ -5,8 +5,8 @@
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "xfa/src/fdp/src/fde/fde_iterator.h"
+
 #include "xfa/src/fgas/include/fx_utl.h"
-#include "xfa/src/foxitlib.h"
 
 IFDE_VisualSetIterator* IFDE_VisualSetIterator::Create() {
   return new CFDE_VisualSetIterator;
diff --git a/xfa/src/fdp/src/fde/fde_object.cpp b/xfa/src/fdp/src/fde/fde_object.cpp
index ba058b8179..fc2de2091e 100644
--- a/xfa/src/fdp/src/fde/fde_object.cpp
+++ b/xfa/src/fdp/src/fde/fde_object.cpp
@@ -5,7 +5,7 @@
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "xfa/src/fdp/src/fde/fde_object.h"
-#include "xfa/src/foxitlib.h"
+
 IFDE_Pen* IFDE_Pen::Create() {
   return new CFDE_Pen();
 }
diff --git a/xfa/src/fdp/src/fde/fde_render.cpp b/xfa/src/fdp/src/fde/fde_render.cpp
index 10ad622637..58c84b7d2e 100644
--- a/xfa/src/fdp/src/fde/fde_render.cpp
+++ b/xfa/src/fdp/src/fde/fde_render.cpp
@@ -5,7 +5,7 @@
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "xfa/src/fdp/src/fde/fde_render.h"
-#include "xfa/src/foxitlib.h"
+
 void FDE_GetPageMatrix(CFX_Matrix& pageMatrix,
                        const CFX_RectF& docPageRect,
                        const CFX_Rect& devicePageRect,
diff --git a/xfa/src/fdp/src/tto/fde_textout.cpp b/xfa/src/fdp/src/tto/fde_textout.cpp
index 8d54574274..913e3f020c 100644
--- a/xfa/src/fdp/src/tto/fde_textout.cpp
+++ b/xfa/src/fdp/src/tto/fde_textout.cpp
@@ -4,10 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
+#include "xfa/src/fdp/src/tto/fde_textout.h"
+
 #include <algorithm>
 
-#include "xfa/src/fdp/src/tto/fde_textout.h"
-#include "xfa/src/foxitlib.h"
 IFDE_TextOut* IFDE_TextOut::Create() {
   return new CFDE_TextOut;
 }
diff --git a/xfa/src/fdp/src/xml/fde_xml_imp.cpp b/xfa/src/fdp/src/xml/fde_xml_imp.cpp
index 6304254feb..91486eb29b 100644
--- a/xfa/src/fdp/src/xml/fde_xml_imp.cpp
+++ b/xfa/src/fdp/src/xml/fde_xml_imp.cpp
@@ -10,15 +10,16 @@
 
 #include "xfa/src/fgas/include/fx_cpg.h"
 #include "xfa/src/fgas/include/fx_sys.h"
-#include "xfa/src/foxitlib.h"
 
 #define FDE_XMLVALIDCHARRANGENUM 5
-static FX_WCHAR g_XMLValidCharRange[FDE_XMLVALIDCHARRANGENUM][2] = {
+
+static const FX_WCHAR g_XMLValidCharRange[FDE_XMLVALIDCHARRANGENUM][2] = {
     {0x09, 0x09},
     {0x0A, 0x0A},
     {0x0D, 0x0D},
     {0x20, 0xD7FF},
     {0xE000, 0xFFFD}};
+
 FX_BOOL FDE_IsXMLValidChar(FX_WCHAR ch) {
   int32_t iStart = 0, iEnd = FDE_XMLVALIDCHARRANGENUM - 1, iMid;
   while (iStart <= iEnd) {