summaryrefslogtreecommitdiff
path: root/xfa/src/fdp
diff options
context:
space:
mode:
authorDan Sinclair <dsinclair@chromium.org>2016-02-25 16:37:22 -0500
committerDan Sinclair <dsinclair@chromium.org>2016-02-25 16:37:22 -0500
commit32982d3531f15561271b7d67062c8b3e21bd3af9 (patch)
treec0da635b3ff73178790afad047d4ec7aac4e77dd /xfa/src/fdp
parent5870b76eab54b30491e1dc35ce09a308462af29a (diff)
downloadpdfium-32982d3531f15561271b7d67062c8b3e21bd3af9.tar.xz
Remove fgas.h and IWYU.
R=thestig@chromium.org Review URL: https://codereview.chromium.org/1740863002 .
Diffstat (limited to 'xfa/src/fdp')
-rw-r--r--xfa/src/fdp/src/css/fde_cssdatatable.cpp4
-rw-r--r--xfa/src/fdp/src/css/fde_cssdeclaration.cpp4
-rw-r--r--xfa/src/fdp/src/css/fde_cssstylesheet.cpp4
-rw-r--r--xfa/src/fdp/src/css/fde_csssyntax.cpp8
-rw-r--r--xfa/src/fdp/src/css/fde_csssyntax.h7
-rw-r--r--xfa/src/fdp/src/xml/fde_xml_imp.cpp5
6 files changed, 28 insertions, 4 deletions
diff --git a/xfa/src/fdp/src/css/fde_cssdatatable.cpp b/xfa/src/fdp/src/css/fde_cssdatatable.cpp
index 322835f294..8284ea1b01 100644
--- a/xfa/src/fdp/src/css/fde_cssdatatable.cpp
+++ b/xfa/src/fdp/src/css/fde_cssdatatable.cpp
@@ -5,6 +5,10 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
#include "xfa/src/fdp/src/css/fde_cssdatatable.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,
diff --git a/xfa/src/fdp/src/css/fde_cssdeclaration.cpp b/xfa/src/fdp/src/css/fde_cssdeclaration.cpp
index 19370000bf..46cb42bb59 100644
--- a/xfa/src/fdp/src/css/fde_cssdeclaration.cpp
+++ b/xfa/src/fdp/src/css/fde_cssdeclaration.cpp
@@ -4,8 +4,10 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "xfa/src/fdp/include/fde_mem.h"
#include "xfa/src/fdp/src/css/fde_cssdeclaration.h"
+
+#include "xfa/src/fdp/include/fde_mem.h"
+#include "xfa/src/fgas/include/fx_sys.h"
#include "xfa/src/foxitlib.h"
IFDE_CSSValue* CFDE_CSSDeclaration::GetProperty(FDE_CSSPROPERTY eProperty,
diff --git a/xfa/src/fdp/src/css/fde_cssstylesheet.cpp b/xfa/src/fdp/src/css/fde_cssstylesheet.cpp
index c2a3660ff1..c41571a121 100644
--- a/xfa/src/fdp/src/css/fde_cssstylesheet.cpp
+++ b/xfa/src/fdp/src/css/fde_cssstylesheet.cpp
@@ -4,10 +4,12 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
+#include "xfa/src/fdp/src/css/fde_cssstylesheet.h"
+
#include "xfa/src/fdp/include/fde_mem.h"
#include "xfa/src/fdp/src/css/fde_cssdatatable.h"
-#include "xfa/src/fdp/src/css/fde_cssstylesheet.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() {
diff --git a/xfa/src/fdp/src/css/fde_csssyntax.cpp b/xfa/src/fdp/src/css/fde_csssyntax.cpp
index 35bb32217d..e2724b2187 100644
--- a/xfa/src/fdp/src/css/fde_csssyntax.cpp
+++ b/xfa/src/fdp/src/css/fde_csssyntax.cpp
@@ -4,19 +4,25 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "xfa/src/fdp/src/css/fde_cssdatatable.h"
#include "xfa/src/fdp/src/css/fde_csssyntax.h"
+
+#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" {
#endif
+
inline FX_BOOL FDE_IsSelectorStart(FX_WCHAR wch) {
return wch == '.' || wch == '#' || wch == '*' || (wch >= 'a' && wch <= 'z') ||
(wch >= 'A' && wch <= 'Z');
}
+
#ifdef _cplusplus
};
#endif
+
IFDE_CSSSyntaxParser* IFDE_CSSSyntaxParser::Create() {
return new CFDE_CSSSyntaxParser;
}
diff --git a/xfa/src/fdp/src/css/fde_csssyntax.h b/xfa/src/fdp/src/css/fde_csssyntax.h
index e0f03bba57..1c7ba514b4 100644
--- a/xfa/src/fdp/src/css/fde_csssyntax.h
+++ b/xfa/src/fdp/src/css/fde_csssyntax.h
@@ -7,6 +7,10 @@
#ifndef XFA_SRC_FDP_SRC_CSS_FDE_CSSSYNTAX_H_
#define XFA_SRC_FDP_SRC_CSS_FDE_CSSSYNTAX_H_
+#include "xfa/src/fdp/include/fde_css.h"
+#include "xfa/src/fgas/include/fx_mem.h"
+#include "xfa/src/fgas/include/fx_stm.h"
+
class CFDE_CSSTextBuf : public CFX_Target {
public:
CFDE_CSSTextBuf();
@@ -51,8 +55,10 @@ class CFDE_CSSTextBuf : public CFX_Target {
int32_t m_iDatLen;
int32_t m_iDatPos;
};
+
#define FDE_CSSSYNTAXCHECK_AllowCharset 1
#define FDE_CSSSYNTAXCHECK_AllowImport 2
+
enum FDE_CSSSYNTAXMODE {
FDE_CSSSYNTAXMODE_RuleSet,
FDE_CSSSYNTAXMODE_Comment,
@@ -67,6 +73,7 @@ enum FDE_CSSSYNTAXMODE {
FDE_CSSSYNTAXMODE_PropertyName,
FDE_CSSSYNTAXMODE_PropertyValue,
};
+
class CFDE_CSSSyntaxParser : public IFDE_CSSSyntaxParser, public CFX_Target {
public:
CFDE_CSSSyntaxParser();
diff --git a/xfa/src/fdp/src/xml/fde_xml_imp.cpp b/xfa/src/fdp/src/xml/fde_xml_imp.cpp
index 941d06e74e..6304254feb 100644
--- a/xfa/src/fdp/src/xml/fde_xml_imp.cpp
+++ b/xfa/src/fdp/src/xml/fde_xml_imp.cpp
@@ -4,9 +4,12 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
+#include "xfa/src/fdp/src/xml/fde_xml_imp.h"
+
#include <algorithm>
-#include "xfa/src/fdp/src/xml/fde_xml_imp.h"
+#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