From e5b0bd1a79f90b7758246655e18ef965a87bcd0b Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Fri, 19 Jun 2015 17:15:41 -0700 Subject: Merge to XFA: Do some IWYU cleanups. R=tsepez@chromium.org Review URL: https://codereview.chromium.org/1176333002. (cherry picked from commit 0ef0de55657db8a83372ad8eb22d84c5893afc4c) Review URL: https://codereview.chromium.org/1195943005. --- xfa/src/fgas/include/fx_tbk.h | 3 +++ xfa/src/fgas/src/layout/fx_rtfbreak.h | 3 +++ xfa/src/fgas/src/layout/fx_textbreak.cpp | 2 ++ xfa/src/fgas/src/layout/fx_textbreak.h | 6 +++++- xfa/src/fgas/src/localization/fx_locale.cpp | 2 ++ xfa/src/fgas/src/localization/fx_localemgr.cpp | 2 ++ 6 files changed, 17 insertions(+), 1 deletion(-) (limited to 'xfa/src/fgas') diff --git a/xfa/src/fgas/include/fx_tbk.h b/xfa/src/fgas/include/fx_tbk.h index 2eaca3922c..eef2db4a69 100644 --- a/xfa/src/fgas/include/fx_tbk.h +++ b/xfa/src/fgas/include/fx_tbk.h @@ -6,6 +6,9 @@ #ifndef _FX_TEXTBREAK #define _FX_TEXTBREAK + +#include "../../../../core/include/fxcrt/fx_ucd.h" + class IFX_Font; class CFX_Char; class IFX_TxtAccess; diff --git a/xfa/src/fgas/src/layout/fx_rtfbreak.h b/xfa/src/fgas/src/layout/fx_rtfbreak.h index 394d433412..09302dfedd 100644 --- a/xfa/src/fgas/src/layout/fx_rtfbreak.h +++ b/xfa/src/fgas/src/layout/fx_rtfbreak.h @@ -6,6 +6,9 @@ #ifndef _FX_RTFBREAK_IMP #define _FX_RTFBREAK_IMP + +#include "../../../../../core/include/fxcrt/fx_arb.h" + class CFX_RTFLine; class CFX_RTFBreak; class CFX_RTFLine diff --git a/xfa/src/fgas/src/layout/fx_textbreak.cpp b/xfa/src/fgas/src/layout/fx_textbreak.cpp index 7a740f5212..f483b87dec 100644 --- a/xfa/src/fgas/src/layout/fx_textbreak.cpp +++ b/xfa/src/fgas/src/layout/fx_textbreak.cpp @@ -4,9 +4,11 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com +#include "../../../../../core/include/fxcrt/fx_arb.h" #include "../fgas_base.h" #include "fx_unicode.h" #include "fx_textbreak.h" + extern const FX_DWORD gs_FX_TextLayout_CodeProperties[65536]; extern const FX_WCHAR gs_FX_TextLayout_VerticalMirror[64]; extern const FX_WCHAR gs_FX_TextLayout_BidiMirror[512]; diff --git a/xfa/src/fgas/src/layout/fx_textbreak.h b/xfa/src/fgas/src/layout/fx_textbreak.h index 310be133c1..5020f0a58c 100644 --- a/xfa/src/fgas/src/layout/fx_textbreak.h +++ b/xfa/src/fgas/src/layout/fx_textbreak.h @@ -6,8 +6,12 @@ #ifndef _FX_TEXTBREAK_IMP #define _FX_TEXTBREAK_IMP -class CFX_TxtLine; + +#include "../../../../../core/include/fxcrt/fx_memory.h" + +class IFX_ArabicChar; class CFX_Txtbreak; + class CFX_TxtLine { public: diff --git a/xfa/src/fgas/src/localization/fx_locale.cpp b/xfa/src/fgas/src/localization/fx_locale.cpp index 1ab98a2f5f..a7625ea1a1 100644 --- a/xfa/src/fgas/src/localization/fx_locale.cpp +++ b/xfa/src/fgas/src/localization/fx_locale.cpp @@ -4,8 +4,10 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com +#include "../../../../../core/include/fxcrt/fx_xml.h" #include "../fgas_base.h" #include "fx_localeimp.h" + #define FX_LOCALECATEGORY_DateHash 0xbde9abde #define FX_LOCALECATEGORY_TimeHash 0x2d71b00f #define FX_LOCALECATEGORY_DateTimeHash 0x158c72ed diff --git a/xfa/src/fgas/src/localization/fx_localemgr.cpp b/xfa/src/fgas/src/localization/fx_localemgr.cpp index ebdd4b89a9..953f00000c 100644 --- a/xfa/src/fgas/src/localization/fx_localemgr.cpp +++ b/xfa/src/fgas/src/localization/fx_localemgr.cpp @@ -4,8 +4,10 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com +#include "../../../../../core/include/fxcrt/fx_xml.h" #include "../fgas_base.h" #include "fx_localemgr.h" + IFX_LocaleMgr* FX_LocaleMgr_Create(const FX_WCHAR* pszLocalPath, FX_WORD wDefaultLCID) { void* pPathHandle = FX_OpenFolder(pszLocalPath); -- cgit v1.2.3