diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-08-19 10:42:45 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-08-19 10:42:45 -0700 |
| commit | 7da980351d6fc428fd95be3015081d911f4470c0 (patch) | |
| tree | 5e0e0dd1e24b770c17bd79397ae097ffd22c5559 /core/src/fxge/ge | |
| parent | 33db790486b89e9a84622788940fd7995e37cf5e (diff) | |
| download | pdfium-7da980351d6fc428fd95be3015081d911f4470c0.tar.xz | |
Merge to XFA: Extern in .cpp files is a code smell, part 1.
(cherry picked from commit 71c15a5e6652952a94ba3a3ef7ac0392e3a06962)
Original Review URL: https://codereview.chromium.org/1299963002 .
R=thestig@chromium.org
TBR=thestig@chromium.org
Review URL: https://codereview.chromium.org/1301073003 .
Diffstat (limited to 'core/src/fxge/ge')
| -rw-r--r-- | core/src/fxge/ge/fx_ge_fontmap.cpp | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/core/src/fxge/ge/fx_ge_fontmap.cpp b/core/src/fxge/ge/fx_ge_fontmap.cpp index 686e941c54..cc4dc07106 100644 --- a/core/src/fxge/ge/fx_ge_fontmap.cpp +++ b/core/src/fxge/ge/fx_ge_fontmap.cpp @@ -8,6 +8,7 @@ #include "../../../include/fxge/fx_ge.h" #include "../../../include/fxge/fx_freetype.h" +#include "../fontdata/chromefontdata/chromefontdata.h" #include "text_int.h" #define GET_TT_SHORT(w) (FX_WORD)(((w)[0] << 8) | (w)[1]) @@ -406,24 +407,6 @@ void CFX_FontMgr::ReleaseFace(FXFT_Face face) { FXFT_Done_Face(face); } } -extern "C" { -extern const unsigned char g_FoxitFixedItalicFontData[18746]; -extern const unsigned char g_FoxitFixedFontData[17597]; -extern const unsigned char g_FoxitSansItalicFontData[16339]; -extern const unsigned char g_FoxitSansFontData[15025]; -extern const unsigned char g_FoxitSerifItalicFontData[21227]; -extern const unsigned char g_FoxitSerifFontData[19469]; -extern const unsigned char g_FoxitFixedBoldItalicFontData[19151]; -extern const unsigned char g_FoxitFixedBoldFontData[18055]; -extern const unsigned char g_FoxitSansBoldItalicFontData[16418]; -extern const unsigned char g_FoxitSansBoldFontData[16344]; -extern const unsigned char g_FoxitSerifBoldItalicFontData[20733]; -extern const unsigned char g_FoxitSerifBoldFontData[19395]; -extern const unsigned char g_FoxitSymbolFontData[16729]; -extern const unsigned char g_FoxitDingbatsFontData[29513]; -extern const unsigned char g_FoxitSerifMMFontData[113417]; -extern const unsigned char g_FoxitSansMMFontData[66919]; -}; const FoxitFonts g_FoxitFonts[14] = { {g_FoxitFixedFontData, 17597}, {g_FoxitFixedBoldFontData, 18055}, |