diff options
| author | Lei Zhang <thestig@chromium.org> | 2015-12-24 21:07:28 -0800 |
|---|---|---|
| committer | Lei Zhang <thestig@chromium.org> | 2015-12-24 21:07:28 -0800 |
| commit | fcfa3b828b92013a45c6bc6d44b04f42a912eff7 (patch) | |
| tree | f0172a20fc1eb9a49abbc62a125b87a8d2c79cd3 /fpdfsdk/src/pdfwindow | |
| parent | aa8bf7e42b8c73a9bc07ed6781364ba05f5a9776 (diff) | |
| download | pdfium-fcfa3b828b92013a45c6bc6d44b04f42a912eff7.tar.xz | |
Merge to XFA: Fix a bad virtual keyword removal from commit 0f6b51c.
BUG=546744
TBR=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1542373002 .
(cherry picked from commit ae58ed8bccc56dd78c12d89972b19d58de94f790)
Review URL: https://codereview.chromium.org/1548093002 .
Diffstat (limited to 'fpdfsdk/src/pdfwindow')
| -rw-r--r-- | fpdfsdk/src/pdfwindow/PWL_FontMap.cpp | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/fpdfsdk/src/pdfwindow/PWL_FontMap.cpp b/fpdfsdk/src/pdfwindow/PWL_FontMap.cpp index d5ca376882..fadea905d4 100644 --- a/fpdfsdk/src/pdfwindow/PWL_FontMap.cpp +++ b/fpdfsdk/src/pdfwindow/PWL_FontMap.cpp @@ -151,13 +151,8 @@ void CPWL_FontMap::Empty() { } } -void CPWL_FontMap::Initial(const FX_CHAR* fontname) { - CFX_ByteString sFontName = fontname; - - if (sFontName.IsEmpty()) - sFontName = DEFAULT_FONT_NAME; - - GetFontIndex(sFontName, ANSI_CHARSET, FALSE); +void CPWL_FontMap::Initialize() { + GetFontIndex(DEFAULT_FONT_NAME, ANSI_CHARSET, FALSE); } /* |