summaryrefslogtreecommitdiff
path: root/fpdfsdk
diff options
context:
space:
mode:
authorDan Sinclair <dsinclair@chromium.org>2016-03-09 16:51:34 -0500
committerDan Sinclair <dsinclair@chromium.org>2016-03-09 16:51:34 -0500
commitdf5a1160154d38d4b8f49df269b55869380d665f (patch)
tree402eae1f0bdb84fd709825c6181cdc2768b49f66 /fpdfsdk
parent4f6fdbe6adf0d90886b9deb5666996603cf1207c (diff)
downloadpdfium-df5a1160154d38d4b8f49df269b55869380d665f.tar.xz
Cleanup some header includes.
Move some of the xfa/ includes in fpdfsdk from the header files to the .cpp files. R=tsepez@chromium.org Review URL: https://codereview.chromium.org/1771353006 .
Diffstat (limited to 'fpdfsdk')
-rw-r--r--fpdfsdk/include/fsdk_define.h6
-rw-r--r--fpdfsdk/include/fsdk_mgr.h7
-rw-r--r--fpdfsdk/src/fpdfxfa/fpdfxfa_app.cpp1
-rw-r--r--fpdfsdk/src/fsdk_annothandler.cpp2
-rw-r--r--fpdfsdk/src/fsdk_mgr.cpp1
5 files changed, 5 insertions, 12 deletions
diff --git a/fpdfsdk/include/fsdk_define.h b/fpdfsdk/include/fsdk_define.h
index fa0098c387..29c8c4432b 100644
--- a/fpdfsdk/include/fsdk_define.h
+++ b/fpdfsdk/include/fsdk_define.h
@@ -20,12 +20,6 @@
#ifdef PDF_ENABLE_XFA
#include "fpdfsdk/include/fpdfxfa/fpdfxfa_doc.h"
-#include "fpdfsdk/include/fpdfxfa/fpdfxfa_page.h"
-#include "xfa/include/fwl/adapter/fwl_adaptertimermgr.h"
-#include "xfa/include/fxbarcode/BC_BarCode.h"
-#include "xfa/include/fxfa/fxfa.h"
-#include "xfa/include/fxgraphics/fx_graphics.h"
-#include "xfa/include/fxjse/fxjse.h"
#endif // PDF_ENABLE_XFA
#ifdef _WIN32
diff --git a/fpdfsdk/include/fsdk_mgr.h b/fpdfsdk/include/fsdk_mgr.h
index 0329dff19b..6543000d4f 100644
--- a/fpdfsdk/include/fsdk_mgr.h
+++ b/fpdfsdk/include/fsdk_mgr.h
@@ -22,12 +22,7 @@
#include "fpdfsdk/include/fx_systemhandler.h"
#include "javascript/IJavaScript.h"
#include "public/fpdf_formfill.h"
-#include "public/fpdf_fwlevent.h" // cross platform keycode and events define.
-
-#ifdef PDF_ENABLE_XFA
-#include "fpdfsdk/include/fpdfxfa/fpdfxfa_doc.h"
-#include "fpdfsdk/include/fpdfxfa/fpdfxfa_page.h"
-#endif // PDF_ENABLE_XFA
+#include "public/fpdf_fwlevent.h"
class CFFL_IFormFiller;
class CPDFSDK_ActionHandler;
diff --git a/fpdfsdk/src/fpdfxfa/fpdfxfa_app.cpp b/fpdfsdk/src/fpdfxfa/fpdfxfa_app.cpp
index 7c686092d0..910cdc511e 100644
--- a/fpdfsdk/src/fpdfxfa/fpdfxfa_app.cpp
+++ b/fpdfsdk/src/fpdfxfa/fpdfxfa_app.cpp
@@ -11,6 +11,7 @@
#include "fpdfsdk/include/fsdk_mgr.h"
#include "fpdfsdk/include/javascript/IJavaScript.h"
#include "public/fpdf_formfill.h"
+#include "xfa/include/fxbarcode/BC_BarCode.h"
CPDFXFA_App* CPDFXFA_App::g_pApp = NULL;
diff --git a/fpdfsdk/src/fsdk_annothandler.cpp b/fpdfsdk/src/fsdk_annothandler.cpp
index 57591d0228..989f535e50 100644
--- a/fpdfsdk/src/fsdk_annothandler.cpp
+++ b/fpdfsdk/src/fsdk_annothandler.cpp
@@ -16,7 +16,9 @@
#ifdef PDF_ENABLE_XFA
#include "fpdfsdk/include/fpdfxfa/fpdfxfa_doc.h"
+#include "fpdfsdk/include/fpdfxfa/fpdfxfa_page.h"
#include "fpdfsdk/include/fpdfxfa/fpdfxfa_util.h"
+#include "xfa/include/fxgraphics/fx_graphics.h"
#endif // PDF_ENABLE_XFA
CPDFSDK_AnnotHandlerMgr::CPDFSDK_AnnotHandlerMgr(CPDFDoc_Environment* pApp) {
diff --git a/fpdfsdk/src/fsdk_mgr.cpp b/fpdfsdk/src/fsdk_mgr.cpp
index ed2df4bc83..b9c27d5d85 100644
--- a/fpdfsdk/src/fsdk_mgr.cpp
+++ b/fpdfsdk/src/fsdk_mgr.cpp
@@ -21,6 +21,7 @@
#include "fpdfsdk/include/fpdfxfa/fpdfxfa_doc.h"
#include "fpdfsdk/include/fpdfxfa/fpdfxfa_page.h"
#include "fpdfsdk/include/fpdfxfa/fpdfxfa_util.h"
+#include "xfa/include/fxgraphics/fx_graphics.h"
#endif // PDF_ENABLE_XFA
#if _FX_OS_ == _FX_ANDROID_