diff options
| author | Lei Zhang <thestig@chromium.org> | 2015-06-19 17:15:41 -0700 |
|---|---|---|
| committer | Lei Zhang <thestig@chromium.org> | 2015-06-19 17:15:41 -0700 |
| commit | e5b0bd1a79f90b7758246655e18ef965a87bcd0b (patch) | |
| tree | c67974b862b888e4ae7b3e8928e3abdcff7c3e58 /xfa/src | |
| parent | 1eb69422e2f35a32ed7d12a330fb2505f8a97f3c (diff) | |
| download | pdfium-e5b0bd1a79f90b7758246655e18ef965a87bcd0b.tar.xz | |
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.
Diffstat (limited to 'xfa/src')
| -rw-r--r-- | xfa/src/fgas/include/fx_tbk.h | 3 | ||||
| -rw-r--r-- | xfa/src/fgas/src/layout/fx_rtfbreak.h | 3 | ||||
| -rw-r--r-- | xfa/src/fgas/src/layout/fx_textbreak.cpp | 2 | ||||
| -rw-r--r-- | xfa/src/fgas/src/layout/fx_textbreak.h | 6 | ||||
| -rw-r--r-- | xfa/src/fgas/src/localization/fx_locale.cpp | 2 | ||||
| -rw-r--r-- | xfa/src/fgas/src/localization/fx_localemgr.cpp | 2 | ||||
| -rw-r--r-- | xfa/src/fxfa/src/parser/xfa_locale.cpp | 2 | ||||
| -rw-r--r-- | xfa/src/fxfa/src/parser/xfa_localemgr.cpp | 2 |
8 files changed, 21 insertions, 1 deletions
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);
diff --git a/xfa/src/fxfa/src/parser/xfa_locale.cpp b/xfa/src/fxfa/src/parser/xfa_locale.cpp index 08b88c1fb1..6c110381e4 100644 --- a/xfa/src/fxfa/src/parser/xfa_locale.cpp +++ b/xfa/src/fxfa/src/parser/xfa_locale.cpp @@ -4,6 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
+#include "../../../../../core/include/fxcrt/fx_xml.h"
#include "../../../foxitlib.h"
#include "../common/xfa_utils.h"
#include "../common/xfa_object.h"
@@ -17,6 +18,7 @@ #include "../common/xfa_fm2jsapi.h"
#include "xfa_debug_parser.h"
#include "xfa_locale.h"
+
static const FX_WCHAR* g_FX_Percent = L"z,zzz,zzz,zzz,zzz,zzz%";
static const FX_WCHAR* g_FX_Currency = L"$z,zzz,zzz,zzz,zzz,zz9.99";
static const FX_WCHAR* g_FX_Decimal = L"z,zzz,zzz,zzz,zzz,zz9.zzz";
diff --git a/xfa/src/fxfa/src/parser/xfa_localemgr.cpp b/xfa/src/fxfa/src/parser/xfa_localemgr.cpp index ae5eab9d9c..f864bc2ac0 100644 --- a/xfa/src/fxfa/src/parser/xfa_localemgr.cpp +++ b/xfa/src/fxfa/src/parser/xfa_localemgr.cpp @@ -4,6 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
+#include "../../../../../core/include/fxcrt/fx_xml.h"
#include "../../../foxitlib.h"
#include "../common/xfa_utils.h"
#include "../common/xfa_object.h"
@@ -17,6 +18,7 @@ #include "../common/xfa_fm2jsapi.h"
#include "xfa_debug_parser.h"
#include "xfa_locale.h"
+
const uint8_t g_enUS_Locale[] = {
0x78, 0x9C, 0x95, 0x56, 0xD1, 0x6E, 0x9B, 0x30, 0x14, 0x7D, 0x9F, 0xB4, 0x7F, 0x40, 0xD6, 0x2A, 0xB5, 0x52, 0x56, 0x6F,
0x8F, 0xA9, 0x88, 0xA5, 0x6C, 0x24, 0x9B, 0x3A, 0xD1, 0x55, 0x22, 0x55, 0xB5, 0xBE, 0x4C, 0x0E, 0xDC, 0x05, 0x34, 0xB0,
|