diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-08-06 11:41:17 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-08-06 11:41:17 -0700 |
| commit | 905cc10ecd06bcacfefb747cc3370c72772f0e15 (patch) | |
| tree | a6d8b5ef354351724bf7fecaf02e5939649f2c0e /core/src/fxge/ge/fx_ge_linux.cpp | |
| parent | 2526930205ca2ef0a06ec32644d41d4548d45d80 (diff) | |
| download | pdfium-905cc10ecd06bcacfefb747cc3370c72772f0e15.tar.xz | |
Add CFX_FontFaceInfo constructor.chromium/2478chromium/2477chromium/2476chromium/2475
(Having renamed CFontFaceInfo to follow naming pattern).
Also cleanup some initialization-order noise in CFX_FontMapper.
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1277883004 .
Diffstat (limited to 'core/src/fxge/ge/fx_ge_linux.cpp')
| -rw-r--r-- | core/src/fxge/ge/fx_ge_linux.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/src/fxge/ge/fx_ge_linux.cpp b/core/src/fxge/ge/fx_ge_linux.cpp index 61202597f5..299806ca07 100644 --- a/core/src/fxge/ge/fx_ge_linux.cpp +++ b/core/src/fxge/ge/fx_ge_linux.cpp @@ -198,13 +198,13 @@ void* CFX_LinuxFontInfo::FindFont(int weight, int pitch_family, const FX_CHAR* family, FX_BOOL bMatchName) { - CFontFaceInfo* pFind = NULL; + CFX_FontFaceInfo* pFind = NULL; FX_DWORD charset_flag = _LinuxGetCharset(charset); int32_t iBestSimilar = 0; FX_POSITION pos = m_FontList.GetStartPosition(); while (pos) { CFX_ByteString bsName; - CFontFaceInfo* pFont = NULL; + CFX_FontFaceInfo* pFont = NULL; m_FontList.GetNextAssoc(pos, bsName, (void*&)pFont); if (!(pFont->m_Charsets & charset_flag) && charset != FXFONT_DEFAULT_CHARSET) { |