diff options
| author | Lei Zhang <thestig@chromium.org> | 2018-01-18 19:03:58 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2018-01-18 19:03:58 +0000 |
| commit | 6e59fb5fda71eb527568a58d9c948b5f76c9bdc2 (patch) | |
| tree | 82bb6ad56c0c5c256500ea8a1d355810846163bb /xfa/fgas | |
| parent | 51344821bb8d1d3309bb1dd82972df26b75745e2 (diff) | |
| download | pdfium-6e59fb5fda71eb527568a58d9c948b5f76c9bdc2.tar.xz | |
Remove more unneeded includes and code from headers.
Change-Id: I0a07dbc9850bef2184ed35ff04b08385fc1bdd17
Reviewed-on: https://pdfium-review.googlesource.com/22891
Commit-Queue: Lei Zhang <thestig@chromium.org>
Reviewed-by: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'xfa/fgas')
| -rw-r--r-- | xfa/fgas/font/cfgas_fontmgr.h | 4 | ||||
| -rw-r--r-- | xfa/fgas/font/cfgas_gefont.h | 1 | ||||
| -rw-r--r-- | xfa/fgas/layout/cfx_break.cpp | 1 | ||||
| -rw-r--r-- | xfa/fgas/layout/cfx_break.h | 3 | ||||
| -rw-r--r-- | xfa/fgas/layout/cfx_rtfbreak.cpp | 1 | ||||
| -rw-r--r-- | xfa/fgas/layout/cfx_rtfbreak.h | 2 |
6 files changed, 7 insertions, 5 deletions
diff --git a/xfa/fgas/font/cfgas_fontmgr.h b/xfa/fgas/font/cfgas_fontmgr.h index 94e446c077..445b318a26 100644 --- a/xfa/fgas/font/cfgas_fontmgr.h +++ b/xfa/fgas/font/cfgas_fontmgr.h @@ -18,13 +18,13 @@ #include "core/fxcrt/fx_extension.h" #include "core/fxcrt/observable.h" #include "core/fxcrt/retain_ptr.h" -#include "core/fxge/cfx_fontmapper.h" #include "core/fxge/fx_freetype.h" #include "core/fxge/ifx_systemfontinfo.h" #include "xfa/fgas/font/cfgas_pdffontmgr.h" -class CFX_FontSourceEnum_File; class CFGAS_GEFont; +class CFX_FontMapper; +class CFX_FontSourceEnum_File; #if _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_ struct FX_FONTMATCHPARAMS { diff --git a/xfa/fgas/font/cfgas_gefont.h b/xfa/fgas/font/cfgas_gefont.h index d14554758b..646562d9ee 100644 --- a/xfa/fgas/font/cfgas_gefont.h +++ b/xfa/fgas/font/cfgas_gefont.h @@ -18,7 +18,6 @@ #include "xfa/fgas/font/cfgas_fontmgr.h" #include "xfa/fgas/font/cfgas_pdffontmgr.h" -class CFGAS_FontMgr; class CFX_UnicodeEncoding; class CFGAS_GEFont : public Retainable { diff --git a/xfa/fgas/layout/cfx_break.cpp b/xfa/fgas/layout/cfx_break.cpp index 6e1103cf65..0f52a2d274 100644 --- a/xfa/fgas/layout/cfx_break.cpp +++ b/xfa/fgas/layout/cfx_break.cpp @@ -10,6 +10,7 @@ #include <vector> #include "third_party/base/stl_util.h" +#include "xfa/fgas/font/cfgas_gefont.h" namespace { diff --git a/xfa/fgas/layout/cfx_break.h b/xfa/fgas/layout/cfx_break.h index 322fa2be8e..789220d9da 100644 --- a/xfa/fgas/layout/cfx_break.h +++ b/xfa/fgas/layout/cfx_break.h @@ -10,9 +10,10 @@ #include <stdint.h> #include "core/fxcrt/retain_ptr.h" -#include "xfa/fgas/font/cfgas_gefont.h" #include "xfa/fgas/layout/cfx_breakline.h" +class CFGAS_GEFont; + struct FX_TPO { bool operator<(const FX_TPO& that) const { return pos < that.pos; } diff --git a/xfa/fgas/layout/cfx_rtfbreak.cpp b/xfa/fgas/layout/cfx_rtfbreak.cpp index 761bd2fc03..3ef0ef2624 100644 --- a/xfa/fgas/layout/cfx_rtfbreak.cpp +++ b/xfa/fgas/layout/cfx_rtfbreak.cpp @@ -10,6 +10,7 @@ #include "core/fxcrt/fx_arabic.h" #include "core/fxcrt/fx_bidi.h" +#include "core/fxge/cfx_renderdevice.h" #include "third_party/base/stl_util.h" #include "xfa/fgas/font/cfgas_gefont.h" #include "xfa/fgas/layout/cfx_linebreak.h" diff --git a/xfa/fgas/layout/cfx_rtfbreak.h b/xfa/fgas/layout/cfx_rtfbreak.h index 5a3f4313b5..67052d23ad 100644 --- a/xfa/fgas/layout/cfx_rtfbreak.h +++ b/xfa/fgas/layout/cfx_rtfbreak.h @@ -13,11 +13,11 @@ #include "core/fxcrt/fx_coordinates.h" #include "core/fxcrt/fx_unicode.h" #include "core/fxcrt/retain_ptr.h" -#include "core/fxge/cfx_renderdevice.h" #include "xfa/fgas/layout/cfx_break.h" #include "xfa/fxfa/cxfa_textuserdata.h" class CFGAS_GEFont; +class FXTEXT_CHARPOS; enum class CFX_RTFLineAlignment { Left = 0, |