From c909ce872d999a17ffd44afdc88caf2de43e6cba Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Fri, 8 Jan 2016 15:44:36 -0800 Subject: XFA: Remove many relative includes in xfa/ Also remove useless files. R=tsepez@chromium.org Review URL: https://codereview.chromium.org/1570743002 . --- xfa/src/fdp/include/fde.h | 2 ++ xfa/src/fdp/include/fde_mem.h | 4 +++- xfa/src/fdp/src/css/fde_csscache.cpp | 2 +- xfa/src/fdp/src/css/fde_cssdatatable.cpp | 10 +++------- xfa/src/fdp/src/css/fde_cssdatatable.h | 8 ++------ xfa/src/fdp/src/css/fde_cssdeclaration.cpp | 2 +- xfa/src/fdp/src/css/fde_cssstyleselector.cpp | 2 +- xfa/src/fdp/src/css/fde_cssstylesheet.cpp | 2 +- xfa/src/fdp/src/css/fde_csssyntax.cpp | 2 +- xfa/src/fdp/src/fde/fde_devbasic.cpp | 2 +- xfa/src/fdp/src/fde/fde_gedevice.cpp | 2 +- xfa/src/fdp/src/fde/fde_geobject.cpp | 2 +- xfa/src/fdp/src/fde/fde_geobject.h | 2 +- xfa/src/fdp/src/fde/fde_iterator.cpp | 2 +- xfa/src/fdp/src/fde/fde_object.cpp | 2 +- xfa/src/fdp/src/fde/fde_render.cpp | 2 +- xfa/src/fdp/src/tto/fde_textout.cpp | 2 +- xfa/src/fdp/src/xml/fde_xml.cpp | 2 +- 18 files changed, 24 insertions(+), 28 deletions(-) (limited to 'xfa/src/fdp') diff --git a/xfa/src/fdp/include/fde.h b/xfa/src/fdp/include/fde.h index 1e2c311188..bb3eae203e 100644 --- a/xfa/src/fdp/include/fde.h +++ b/xfa/src/fdp/include/fde.h @@ -4,6 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com +// TODO(thestig): Remove this file and do IWYU. + #ifndef _FDE #define _FDE #include "fde_mem.h" diff --git a/xfa/src/fdp/include/fde_mem.h b/xfa/src/fdp/include/fde_mem.h index c05ab8e85b..9ecf037683 100644 --- a/xfa/src/fdp/include/fde_mem.h +++ b/xfa/src/fdp/include/fde_mem.h @@ -4,10 +4,12 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com +// TODO(thestig): Remove this file and do IWYU. + #ifndef FDE_MEM_H_ #define FDE_MEM_H_ -#include "../../../../core/include/fxcrt/fx_memory.h" +#include "core/include/fxcrt/fx_memory.h" #define FDE_NewWith FXTARGET_NewWith #define FDE_DeleteWith FXTARGET_DeleteWith diff --git a/xfa/src/fdp/src/css/fde_csscache.cpp b/xfa/src/fdp/src/css/fde_csscache.cpp index b04758649f..fd33019e18 100644 --- a/xfa/src/fdp/src/css/fde_csscache.cpp +++ b/xfa/src/fdp/src/css/fde_csscache.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" +#include "xfa/src/foxitlib.h" #include "fde_csscache.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 fc74aba1c5..fa64122fca 100644 --- a/xfa/src/fdp/src/css/fde_cssdatatable.cpp +++ b/xfa/src/fdp/src/css/fde_cssdatatable.cpp @@ -4,11 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" +#include "xfa/src/foxitlib.h" #include "fde_cssdatatable.h" -#ifdef _cplusplus -extern "C" { -#endif + FX_BOOL FDE_CSSLengthToFloat(const FDE_CSSLENGTH& len, FX_FLOAT fPercentBase, FX_FLOAT& fResult) { @@ -776,9 +774,7 @@ FX_BOOL FDE_ParseCSSColor(const FX_WCHAR* pszValue, } return FALSE; } -#ifdef _cplusplus -}; -#endif + CFDE_CSSValueList::CFDE_CSSValueList(IFX_MEMAllocator* pStaticStore, const CFDE_CSSValueArray& list) { m_iCount = list.GetSize(); diff --git a/xfa/src/fdp/src/css/fde_cssdatatable.h b/xfa/src/fdp/src/css/fde_cssdatatable.h index 53dfe8769f..4d75d556a2 100644 --- a/xfa/src/fdp/src/css/fde_cssdatatable.h +++ b/xfa/src/fdp/src/css/fde_cssdatatable.h @@ -115,9 +115,7 @@ class CFDE_CSSValueListParser : public CFX_Target { const FX_WCHAR* m_pCur; const FX_WCHAR* m_pEnd; }; -#ifdef _cplusplus -extern "C" { -#endif + #define FDE_CSSVALUETYPE_MaybeNumber 0x0100 #define FDE_CSSVALUETYPE_MaybeEnum 0x0200 #define FDE_CSSVALUETYPE_MaybeURI 0x0400 @@ -193,7 +191,5 @@ FX_BOOL FDE_ParseCSSURI(const FX_WCHAR* pszValue, int32_t iValueLen, int32_t& iOffset, int32_t& iLength); -#ifdef _cplusplus -}; -#endif + #endif diff --git a/xfa/src/fdp/src/css/fde_cssdeclaration.cpp b/xfa/src/fdp/src/css/fde_cssdeclaration.cpp index c81b2cb373..d78d94ed5c 100644 --- a/xfa/src/fdp/src/css/fde_cssdeclaration.cpp +++ b/xfa/src/fdp/src/css/fde_cssdeclaration.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" +#include "xfa/src/foxitlib.h" #include "fde_cssdeclaration.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 6600449aa5..8a832b413a 100644 --- a/xfa/src/fdp/src/css/fde_cssstyleselector.cpp +++ b/xfa/src/fdp/src/css/fde_cssstyleselector.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" +#include "xfa/src/foxitlib.h" #include "fde_csscache.h" #include "fde_cssdeclaration.h" #include "fde_cssstyleselector.h" diff --git a/xfa/src/fdp/src/css/fde_cssstylesheet.cpp b/xfa/src/fdp/src/css/fde_cssstylesheet.cpp index 0ba1751b9f..4e9567fa33 100644 --- a/xfa/src/fdp/src/css/fde_cssstylesheet.cpp +++ b/xfa/src/fdp/src/css/fde_cssstylesheet.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" +#include "xfa/src/foxitlib.h" #include "fde_csssyntax.h" #include "fde_cssdatatable.h" #include "fde_cssstylesheet.h" diff --git a/xfa/src/fdp/src/css/fde_csssyntax.cpp b/xfa/src/fdp/src/css/fde_csssyntax.cpp index 7d540bb623..2cd3d12b64 100644 --- a/xfa/src/fdp/src/css/fde_csssyntax.cpp +++ b/xfa/src/fdp/src/css/fde_csssyntax.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" +#include "xfa/src/foxitlib.h" #include "fde_csssyntax.h" #include "fde_cssdatatable.h" #ifdef _cplusplus diff --git a/xfa/src/fdp/src/fde/fde_devbasic.cpp b/xfa/src/fdp/src/fde/fde_devbasic.cpp index 78a0fa6d68..30030f826c 100644 --- a/xfa/src/fdp/src/fde/fde_devbasic.cpp +++ b/xfa/src/fdp/src/fde/fde_devbasic.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" +#include "xfa/src/foxitlib.h" #include "fde_devbasic.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 8eb325ee02..08f05e74bb 100644 --- a/xfa/src/fdp/src/fde/fde_gedevice.cpp +++ b/xfa/src/fdp/src/fde/fde_gedevice.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" +#include "xfa/src/foxitlib.h" #include "fde_gedevice.h" #include "fde_geobject.h" #include "fde_devbasic.h" diff --git a/xfa/src/fdp/src/fde/fde_geobject.cpp b/xfa/src/fdp/src/fde/fde_geobject.cpp index 01ecd1ece7..53770810fc 100644 --- a/xfa/src/fdp/src/fde/fde_geobject.cpp +++ b/xfa/src/fdp/src/fde/fde_geobject.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" +#include "xfa/src/foxitlib.h" #include "fde_object.h" #include "fde_geobject.h" #ifndef _FDEPLUS diff --git a/xfa/src/fdp/src/fde/fde_geobject.h b/xfa/src/fdp/src/fde/fde_geobject.h index eb465a1ad6..d09831b8aa 100644 --- a/xfa/src/fdp/src/fde/fde_geobject.h +++ b/xfa/src/fdp/src/fde/fde_geobject.h @@ -7,7 +7,7 @@ #ifndef _FDE_GRAPHOBJS_IMP #define _FDE_GRAPHOBJS_IMP #ifndef _FDEPLUS -#include "../../../foxitlib.h" +#include "xfa/src/foxitlib.h" class CFDE_GEFontMgr; 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 daf3d0be02..75bca9ee8c 100644 --- a/xfa/src/fdp/src/fde/fde_iterator.cpp +++ b/xfa/src/fdp/src/fde/fde_iterator.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" +#include "xfa/src/foxitlib.h" #include "fde_iterator.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 3ae84a7df7..5eeb94135e 100644 --- a/xfa/src/fdp/src/fde/fde_object.cpp +++ b/xfa/src/fdp/src/fde/fde_object.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" +#include "xfa/src/foxitlib.h" #include "fde_object.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 f47c9fef76..1d6351bf20 100644 --- a/xfa/src/fdp/src/fde/fde_render.cpp +++ b/xfa/src/fdp/src/fde/fde_render.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" +#include "xfa/src/foxitlib.h" #include "fde_render.h" void FDE_GetPageMatrix(CFX_Matrix& pageMatrix, const CFX_RectF& docPageRect, diff --git a/xfa/src/fdp/src/tto/fde_textout.cpp b/xfa/src/fdp/src/tto/fde_textout.cpp index 9781c7f943..b9a8e80107 100644 --- a/xfa/src/fdp/src/tto/fde_textout.cpp +++ b/xfa/src/fdp/src/tto/fde_textout.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" +#include "xfa/src/foxitlib.h" #include "fde_textout.h" IFDE_TextOut* IFDE_TextOut::Create() { return new CFDE_TextOut; diff --git a/xfa/src/fdp/src/xml/fde_xml.cpp b/xfa/src/fdp/src/xml/fde_xml.cpp index 00a3bf24eb..aa217227c4 100644 --- a/xfa/src/fdp/src/xml/fde_xml.cpp +++ b/xfa/src/fdp/src/xml/fde_xml.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" +#include "xfa/src/foxitlib.h" #include "fde_xml.h" #ifdef __cplusplus extern "C" { -- cgit v1.2.3