diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-08-06 11:57:04 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-08-06 11:57:04 -0700 |
| commit | 792d55cfe3cf046125fd69d8914ae459216a68ab (patch) | |
| tree | 1883b08e786516529c9a1a8b0cdee7d4eba90aa8 /core/src/fxge/ge/fx_ge_linux.cpp | |
| parent | b14283e6b7f2521070106b070eb74219dfd97e1b (diff) | |
| download | pdfium-792d55cfe3cf046125fd69d8914ae459216a68ab.tar.xz | |
Merge to XFA: Add CFX_FontFaceInfo constructor.
(cherry picked from commit 905cc10ecd06bcacfefb747cc3370c72772f0e15)
Original Review URL: https://codereview.chromium.org/1277883004 .
TBR=thestig@chromium.org
Review URL: https://codereview.chromium.org/1279873002 .
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 cb8a0add76..bad3854afe 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) { |