diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2017-09-27 13:43:44 -0400 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-09-27 20:31:01 +0000 |
| commit | 86f5cf12b517d348a64868a477a19fbf1f1318fc (patch) | |
| tree | ab1c6ae56474f33fdcd7e02281c65ebbc7e448e5 | |
| parent | 60830ae5a056601dec5eb3c9a9589e29cfc9e041 (diff) | |
| download | pdfium-86f5cf12b517d348a64868a477a19fbf1f1318fc.tar.xz | |
Cleanup some font headers
This CL moves some font defines to the only .cpp file they're used in
and removes un-needed forward declarations from fx_font.h.
Change-Id: Ic291a42d6bddfa6537111a7d42728802236e6e26
Reviewed-on: https://pdfium-review.googlesource.com/14970
Commit-Queue: dsinclair <dsinclair@chromium.org>
Reviewed-by: Henrique Nakashima <hnakashima@chromium.org>
| -rw-r--r-- | core/fxge/cfx_facecache.h | 1 | ||||
| -rw-r--r-- | core/fxge/cfx_folderfontinfo.cpp | 7 | ||||
| -rw-r--r-- | core/fxge/cfx_renderdevice.h | 2 | ||||
| -rw-r--r-- | core/fxge/fx_font.h | 14 | ||||
| -rw-r--r-- | public/fpdf_sysfontinfo.h | 2 |
5 files changed, 12 insertions, 14 deletions
diff --git a/core/fxge/cfx_facecache.h b/core/fxge/cfx_facecache.h index 95f01d2f10..aa98161719 100644 --- a/core/fxge/cfx_facecache.h +++ b/core/fxge/cfx_facecache.h @@ -19,6 +19,7 @@ #endif class CFX_Font; +class CFX_PathData; class CFX_FaceCache { public: diff --git a/core/fxge/cfx_folderfontinfo.cpp b/core/fxge/cfx_folderfontinfo.cpp index 3087552fb8..dbc8142d69 100644 --- a/core/fxge/cfx_folderfontinfo.cpp +++ b/core/fxge/cfx_folderfontinfo.cpp @@ -16,6 +16,13 @@ #include "third_party/base/ptr_util.h" #include "third_party/base/stl_util.h" +#define CHARSET_FLAG_ANSI (1 << 0) +#define CHARSET_FLAG_SYMBOL (1 << 1) +#define CHARSET_FLAG_SHIFTJIS (1 << 2) +#define CHARSET_FLAG_BIG5 (1 << 3) +#define CHARSET_FLAG_GB (1 << 4) +#define CHARSET_FLAG_KOREAN (1 << 5) + namespace { const struct { diff --git a/core/fxge/cfx_renderdevice.h b/core/fxge/cfx_renderdevice.h index 66fa0a8c6b..191e300490 100644 --- a/core/fxge/cfx_renderdevice.h +++ b/core/fxge/cfx_renderdevice.h @@ -62,6 +62,8 @@ class IFX_RenderDeviceDriver; #define FXTEXT_PRINTIMAGETEXT 0x10 #define FXTEXT_NOSMOOTH 0x20 +class CFX_PathData; + enum class FXPT_TYPE : uint8_t { LineTo, BezierTo, MoveTo }; class FXTEXT_CHARPOS { diff --git a/core/fxge/fx_font.h b/core/fxge/fx_font.h index d55160aef5..0271b78a22 100644 --- a/core/fxge/fx_font.h +++ b/core/fxge/fx_font.h @@ -18,11 +18,6 @@ #include "core/fxge/fx_dib.h" #include "core/fxge/fx_freetype.h" -class CFX_FaceCache; -class CFX_GlyphBitmap; -class CFX_PathData; -class IFX_SeekableReadStream; - #if defined _SKIA_SUPPORT_ || defined _SKIA_SUPPORT_PATHS_ class SkTypeface; @@ -30,7 +25,7 @@ using CFX_TypeFace = SkTypeface; #endif /* Font pitch and family flags */ -#define FXFONT_FF_FIXEDPITCH 1 +#define FXFONT_FF_FIXEDPITCH (1 << 0) #define FXFONT_FF_ROMAN (1 << 4) #define FXFONT_FF_SCRIPT (4 << 4) @@ -56,13 +51,6 @@ using CFX_TypeFace = SkTypeface; #define FXFONT_EXACTMATCH 0x80000000 #endif // PDF_ENABLE_XFA -#define CHARSET_FLAG_ANSI 1 -#define CHARSET_FLAG_SYMBOL 2 -#define CHARSET_FLAG_SHIFTJIS 4 -#define CHARSET_FLAG_BIG5 8 -#define CHARSET_FLAG_GB 16 -#define CHARSET_FLAG_KOREAN 32 - #define GET_TT_SHORT(w) (uint16_t)(((w)[0] << 8) | (w)[1]) #define GET_TT_LONG(w) \ (uint32_t)(((w)[0] << 24) | ((w)[1] << 16) | ((w)[2] << 8) | (w)[3]) diff --git a/public/fpdf_sysfontinfo.h b/public/fpdf_sysfontinfo.h index 4acaa033b2..c9aa33856d 100644 --- a/public/fpdf_sysfontinfo.h +++ b/public/fpdf_sysfontinfo.h @@ -20,7 +20,7 @@ #define FXFONT_CHINESEBIG5_CHARSET 136 /* Font pitch and family flags */ -#define FXFONT_FF_FIXEDPITCH 1 +#define FXFONT_FF_FIXEDPITCH (1 << 0) #define FXFONT_FF_ROMAN (1 << 4) #define FXFONT_FF_SCRIPT (4 << 4) |