From 32982d3531f15561271b7d67062c8b3e21bd3af9 Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Thu, 25 Feb 2016 16:37:22 -0500 Subject: Remove fgas.h and IWYU. R=thestig@chromium.org Review URL: https://codereview.chromium.org/1740863002 . --- xfa/src/fxfa/src/app/xfa_checksum.cpp | 4 +++- xfa/src/fxfa/src/app/xfa_checksum.h | 5 +++++ xfa/src/fxfa/src/app/xfa_ffdoc.cpp | 1 + xfa/src/fxfa/src/app/xfa_fwltheme.cpp | 4 +++- xfa/src/fxfa/src/app/xfa_fwltheme.h | 1 + xfa/src/fxfa/src/app/xfa_textlayout.cpp | 5 ++++- xfa/src/fxfa/src/parser/xfa_basic_imp.cpp | 3 +++ xfa/src/fxfa/src/parser/xfa_document_serialize.cpp | 5 ++++- xfa/src/fxfa/src/parser/xfa_document_serialize.h | 3 +++ xfa/src/fxfa/src/parser/xfa_layout_itemlayout.cpp | 5 ++++- xfa/src/fxfa/src/parser/xfa_layout_itemlayout.h | 6 +++++- xfa/src/fxfa/src/parser/xfa_object_imp.cpp | 3 +++ xfa/src/fxfa/src/parser/xfa_parser_imp.cpp | 5 ++++- xfa/src/fxfa/src/parser/xfa_parser_imp.h | 6 ++++++ 14 files changed, 49 insertions(+), 7 deletions(-) (limited to 'xfa/src/fxfa') diff --git a/xfa/src/fxfa/src/app/xfa_checksum.cpp b/xfa/src/fxfa/src/app/xfa_checksum.cpp index 9c1597811f..22fe715450 100644 --- a/xfa/src/fxfa/src/app/xfa_checksum.cpp +++ b/xfa/src/fxfa/src/app/xfa_checksum.cpp @@ -4,9 +4,11 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa/src/foxitlib.h" #include "xfa/src/fxfa/src/app/xfa_checksum.h" +#include "xfa/src/fgas/include/fx_alg.h" +#include "xfa/src/foxitlib.h" + CXFA_SAXReaderHandler::CXFA_SAXReaderHandler(CXFA_ChecksumContext* pContext) : m_pContext(pContext) { FXSYS_assert(m_pContext); diff --git a/xfa/src/fxfa/src/app/xfa_checksum.h b/xfa/src/fxfa/src/app/xfa_checksum.h index 5927e5335f..16e634d877 100644 --- a/xfa/src/fxfa/src/app/xfa_checksum.h +++ b/xfa/src/fxfa/src/app/xfa_checksum.h @@ -7,8 +7,12 @@ #ifndef XFA_SRC_FXFA_SRC_APP_XFA_CHECKSUM_H_ #define XFA_SRC_FXFA_SRC_APP_XFA_CHECKSUM_H_ +#include "xfa/include/fxfa/fxfa.h" +#include "xfa/src/fgas/include/fx_sax.h" + class CXFA_SAXReaderHandler; class CXFA_ChecksumContext; + class CXFA_SAXContext { public: CXFA_SAXContext() : m_eNode(FX_SAXNODE_Unknown) {} @@ -46,6 +50,7 @@ class CXFA_SAXReaderHandler : public IFX_SAXReaderHandler { CXFA_ChecksumContext* m_pContext; CXFA_SAXContext m_SAXContext; }; + class CXFA_ChecksumContext : public IXFA_ChecksumContext { public: CXFA_ChecksumContext(); diff --git a/xfa/src/fxfa/src/app/xfa_ffdoc.cpp b/xfa/src/fxfa/src/app/xfa_ffdoc.cpp index b6f8c90371..770b8ef3de 100644 --- a/xfa/src/fxfa/src/app/xfa_ffdoc.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffdoc.cpp @@ -7,6 +7,7 @@ #include "xfa/src/fxfa/src/app/xfa_ffdoc.h" #include "xfa/include/fwl/core/fwl_note.h" +#include "xfa/src/fgas/include/fx_alg.h" #include "xfa/src/foxitlib.h" #include "xfa/src/fxfa/src/app/xfa_ffapp.h" #include "xfa/src/fxfa/src/app/xfa_ffdocview.h" diff --git a/xfa/src/fxfa/src/app/xfa_fwltheme.cpp b/xfa/src/fxfa/src/app/xfa_fwltheme.cpp index 2e95732da2..f1aa18848d 100644 --- a/xfa/src/fxfa/src/app/xfa_fwltheme.cpp +++ b/xfa/src/fxfa/src/app/xfa_fwltheme.cpp @@ -4,6 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com +#include "xfa/src/fxfa/src/app/xfa_fwltheme.h" + #include "xfa/include/fwl/basewidget/fwl_barcode.h" #include "xfa/include/fwl/basewidget/fwl_caret.h" #include "xfa/include/fwl/basewidget/fwl_checkbox.h" @@ -16,10 +18,10 @@ #include "xfa/include/fwl/basewidget/fwl_pushbutton.h" #include "xfa/include/fwl/basewidget/fwl_scrollbar.h" #include "xfa/src/fdp/include/fde_tto.h" +#include "xfa/src/fgas/include/fx_cpg.h" #include "xfa/src/foxitlib.h" #include "xfa/src/fxfa/src/app/xfa_ffapp.h" #include "xfa/src/fxfa/src/app/xfa_ffwidget.h" -#include "xfa/src/fxfa/src/app/xfa_fwltheme.h" CXFA_FFWidget* XFA_ThemeGetOuterWidget(IFWL_Widget* pWidget) { IFWL_Widget* pOuter = pWidget; diff --git a/xfa/src/fxfa/src/app/xfa_fwltheme.h b/xfa/src/fxfa/src/app/xfa_fwltheme.h index ed0b681f2a..f58f9569b3 100644 --- a/xfa/src/fxfa/src/app/xfa_fwltheme.h +++ b/xfa/src/fxfa/src/app/xfa_fwltheme.h @@ -21,6 +21,7 @@ #include "xfa/include/fwl/theme/pushbuttontp.h" #include "xfa/include/fwl/theme/scrollbartp.h" #include "xfa/include/fwl/theme/widgettp.h" +#include "xfa/src/fxfa/src/app/xfa_ffapp.h" class CXFA_FWLTheme : public IFWL_ThemeProvider { public: diff --git a/xfa/src/fxfa/src/app/xfa_textlayout.cpp b/xfa/src/fxfa/src/app/xfa_textlayout.cpp index 1c1dad7e42..5192735fda 100644 --- a/xfa/src/fxfa/src/app/xfa_textlayout.cpp +++ b/xfa/src/fxfa/src/app/xfa_textlayout.cpp @@ -4,13 +4,16 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com +#include "xfa/src/fxfa/src/app/xfa_textlayout.h" + #include +#include "xfa/src/fgas/include/fx_alg.h" +#include "xfa/src/fgas/include/fx_cpg.h" #include "xfa/src/foxitlib.h" #include "xfa/src/fxfa/src/app/xfa_ffapp.h" #include "xfa/src/fxfa/src/app/xfa_ffdoc.h" #include "xfa/src/fxfa/src/app/xfa_fontmgr.h" -#include "xfa/src/fxfa/src/app/xfa_textlayout.h" CXFA_CSSTagProvider::~CXFA_CSSTagProvider() { FX_POSITION pos = m_Attributes.GetStartPosition(); diff --git a/xfa/src/fxfa/src/parser/xfa_basic_imp.cpp b/xfa/src/fxfa/src/parser/xfa_basic_imp.cpp index 848ae44b8c..f724ed654c 100644 --- a/xfa/src/fxfa/src/parser/xfa_basic_imp.cpp +++ b/xfa/src/fxfa/src/parser/xfa_basic_imp.cpp @@ -4,6 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com +#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" #include "xfa/src/fxfa/src/common/xfa_docdata.h" #include "xfa/src/fxfa/src/common/xfa_doclayout.h" diff --git a/xfa/src/fxfa/src/parser/xfa_document_serialize.cpp b/xfa/src/fxfa/src/parser/xfa_document_serialize.cpp index ab440c23ca..fc05d7de6e 100644 --- a/xfa/src/fxfa/src/parser/xfa_document_serialize.cpp +++ b/xfa/src/fxfa/src/parser/xfa_document_serialize.cpp @@ -4,6 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com +#include "xfa/src/fxfa/src/parser/xfa_document_serialize.h" + +#include "xfa/src/fgas/include/fx_cpg.h" #include "xfa/src/foxitlib.h" #include "xfa/src/fxfa/src/common/xfa_docdata.h" #include "xfa/src/fxfa/src/common/xfa_doclayout.h" @@ -14,7 +17,7 @@ #include "xfa/src/fxfa/src/common/xfa_parser.h" #include "xfa/src/fxfa/src/common/xfa_script.h" #include "xfa/src/fxfa/src/common/xfa_utils.h" -#include "xfa/src/fxfa/src/parser/xfa_document_serialize.h" + IXFA_PacketImport* IXFA_PacketImport::Create(CXFA_Document* pDocument) { return new CXFA_DataImporter(pDocument); } diff --git a/xfa/src/fxfa/src/parser/xfa_document_serialize.h b/xfa/src/fxfa/src/parser/xfa_document_serialize.h index bcec733772..0aa701a175 100644 --- a/xfa/src/fxfa/src/parser/xfa_document_serialize.h +++ b/xfa/src/fxfa/src/parser/xfa_document_serialize.h @@ -7,6 +7,8 @@ #ifndef XFA_SRC_FXFA_SRC_PARSER_XFA_DOCUMENT_SERIALIZE_H_ #define XFA_SRC_FXFA_SRC_PARSER_XFA_DOCUMENT_SERIALIZE_H_ +#include "xfa/src/fxfa/src/common/xfa_docdata.h" + class CXFA_DataImporter : public IXFA_PacketImport { public: CXFA_DataImporter(CXFA_Document* pDocument); @@ -16,6 +18,7 @@ class CXFA_DataImporter : public IXFA_PacketImport { protected: CXFA_Document* m_pDocument; }; + class CXFA_DataExporter : public IXFA_PacketExport { public: CXFA_DataExporter(CXFA_Document* pDocument); diff --git a/xfa/src/fxfa/src/parser/xfa_layout_itemlayout.cpp b/xfa/src/fxfa/src/parser/xfa_layout_itemlayout.cpp index e1282c1f9e..819a5e121b 100644 --- a/xfa/src/fxfa/src/parser/xfa_layout_itemlayout.cpp +++ b/xfa/src/fxfa/src/parser/xfa_layout_itemlayout.cpp @@ -4,9 +4,12 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com +#include "xfa/src/fxfa/src/parser/xfa_layout_itemlayout.h" + #include #include +#include "xfa/src/fgas/include/fx_alg.h" #include "xfa/src/foxitlib.h" #include "xfa/src/fxfa/src/common/xfa_docdata.h" #include "xfa/src/fxfa/src/common/xfa_doclayout.h" @@ -19,8 +22,8 @@ #include "xfa/src/fxfa/src/common/xfa_utils.h" #include "xfa/src/fxfa/src/parser/xfa_document_layout_imp.h" #include "xfa/src/fxfa/src/parser/xfa_layout_appadapter.h" -#include "xfa/src/fxfa/src/parser/xfa_layout_itemlayout.h" #include "xfa/src/fxfa/src/parser/xfa_layout_pagemgr_new.h" + CXFA_ItemLayoutProcessor::CXFA_ItemLayoutProcessor(CXFA_Node* pNode, CXFA_LayoutPageMgr* pPageMgr) : m_bKeepBreakFinish(FALSE), diff --git a/xfa/src/fxfa/src/parser/xfa_layout_itemlayout.h b/xfa/src/fxfa/src/parser/xfa_layout_itemlayout.h index 9ef40935a0..caa48e215f 100644 --- a/xfa/src/fxfa/src/parser/xfa_layout_itemlayout.h +++ b/xfa/src/fxfa/src/parser/xfa_layout_itemlayout.h @@ -7,10 +7,14 @@ #ifndef XFA_SRC_FXFA_SRC_PARSER_XFA_LAYOUT_ITEMLAYOUT_H_ #define XFA_SRC_FXFA_SRC_PARSER_XFA_LAYOUT_ITEMLAYOUT_H_ -#include "float.h" +#include #include +#include "core/include/fxcrt/fx_basic.h" +#include "xfa/src/fxfa/src/common/xfa_doclayout.h" +#include "xfa/src/fxfa/src/parser/xfa_document_layout_imp.h" + #define XFA_LAYOUT_INVALIDNODE ((CXFA_Node*)(intptr_t)-1) #define XFA_LAYOUT_FLOAT_PERCISION (0.0005f) #define XFA_LAYOUT_FLOAT_MAX FLT_MAX diff --git a/xfa/src/fxfa/src/parser/xfa_object_imp.cpp b/xfa/src/fxfa/src/parser/xfa_object_imp.cpp index ec70e133a1..67028ee3cd 100644 --- a/xfa/src/fxfa/src/parser/xfa_object_imp.cpp +++ b/xfa/src/fxfa/src/parser/xfa_object_imp.cpp @@ -4,6 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com +#include "xfa/src/fgas/include/fx_cpg.h" +#include "xfa/src/fgas/include/fx_sys.h" #include "xfa/src/foxitlib.h" #include "xfa/src/fxfa/src/common/xfa_docdata.h" #include "xfa/src/fxfa/src/common/xfa_doclayout.h" @@ -16,6 +18,7 @@ #include "xfa/src/fxfa/src/common/xfa_utils.h" #include "xfa/src/fxfa/src/parser/xfa_basic_imp.h" #include "xfa/src/fxfa/src/parser/xfa_document_layout_imp.h" + CXFA_Object::CXFA_Object(CXFA_Document* pDocument, FX_DWORD uFlags) : m_pDocument(pDocument), m_uFlags(uFlags) {} void CXFA_Object::GetClassName(CFX_WideStringC& wsName) const { diff --git a/xfa/src/fxfa/src/parser/xfa_parser_imp.cpp b/xfa/src/fxfa/src/parser/xfa_parser_imp.cpp index 94f04e55f0..3baed96cba 100644 --- a/xfa/src/fxfa/src/parser/xfa_parser_imp.cpp +++ b/xfa/src/fxfa/src/parser/xfa_parser_imp.cpp @@ -4,6 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com +#include "xfa/src/fxfa/src/parser/xfa_parser_imp.h" + +#include "xfa/src/fgas/include/fx_cpg.h" #include "xfa/src/foxitlib.h" #include "xfa/src/fxfa/src/common/xfa_docdata.h" #include "xfa/src/fxfa/src/common/xfa_doclayout.h" @@ -15,7 +18,7 @@ #include "xfa/src/fxfa/src/common/xfa_script.h" #include "xfa/src/fxfa/src/common/xfa_utils.h" #include "xfa/src/fxfa/src/parser/xfa_basic_imp.h" -#include "xfa/src/fxfa/src/parser/xfa_parser_imp.h" + IXFA_Parser* IXFA_Parser::Create(IXFA_ObjFactory* pFactory, FX_BOOL bDocumentParser) { return new CXFA_SimpleParser(pFactory, bDocumentParser); diff --git a/xfa/src/fxfa/src/parser/xfa_parser_imp.h b/xfa/src/fxfa/src/parser/xfa_parser_imp.h index 6c6593ae03..a9ce2e5eeb 100644 --- a/xfa/src/fxfa/src/parser/xfa_parser_imp.h +++ b/xfa/src/fxfa/src/parser/xfa_parser_imp.h @@ -7,8 +7,12 @@ #ifndef XFA_SRC_FXFA_SRC_PARSER_XFA_PARSER_IMP_H_ #define XFA_SRC_FXFA_SRC_PARSER_XFA_PARSER_IMP_H_ +#include "xfa/src/fxfa/src/common/xfa_parser.h" + #define _XFA_VERIFY_Checksum_ + class CXFA_XMLParser; + class CXFA_SimpleParser : public IXFA_Parser { public: CXFA_SimpleParser(IXFA_ObjFactory* pFactory, FX_BOOL bDocumentParser = FALSE); @@ -77,6 +81,7 @@ class CXFA_SimpleParser : public IXFA_Parser { FX_BOOL m_bDocumentParser; friend class CXFA_DocumentParser; }; + class CXFA_DocumentParser : public IXFA_DocParser { public: CXFA_DocumentParser(IXFA_Notify* pNotify); @@ -104,6 +109,7 @@ class CXFA_DocumentParser : public IXFA_DocParser { CXFA_Document* m_pDocument; }; typedef CFX_StackTemplate CXFA_XMLNodeStack; + class CXFA_XMLParser : public IFDE_XMLParser { public: CXFA_XMLParser(IFDE_XMLNode* pRoot, IFX_Stream* pStream); -- cgit v1.2.3