diff options
| author | Lei Zhang <thestig@chromium.org> | 2016-01-08 14:24:37 -0800 |
|---|---|---|
| committer | Lei Zhang <thestig@chromium.org> | 2016-01-08 14:24:37 -0800 |
| commit | 1b97664bc5b84c7a2b87cc656f8c6a0476f9b71f (patch) | |
| tree | 11c6727d7fa3d2dac36b879c3bbd106326c7ca43 /fpdfsdk/src/pdfwindow | |
| parent | 6a1c51b9eb666f2e120ec098d900663627ebcb3e (diff) | |
| download | pdfium-1b97664bc5b84c7a2b87cc656f8c6a0476f9b71f.tar.xz | |
Merge to XFA: Clean up misc nits found while fixing bugs.
Some bits regressed in commit 338805f.
Also merge: IWYU fix after commit c5a8933.
R=tsepez@chromium.org
TBR=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1544963002 .
Review URL: https://codereview.chromium.org/1570973002 .
(cherry picked from commit c5a8933f260ca1034fde902058442984e55c0f7a)
(cherry picked from commit e6bd31873c3dba3f79c5ebbbefed636948629cc9)
Review URL: https://codereview.chromium.org/1577453002 .
Diffstat (limited to 'fpdfsdk/src/pdfwindow')
| -rw-r--r-- | fpdfsdk/src/pdfwindow/PWL_FontMap.cpp | 48 |
1 files changed, 22 insertions, 26 deletions
diff --git a/fpdfsdk/src/pdfwindow/PWL_FontMap.cpp b/fpdfsdk/src/pdfwindow/PWL_FontMap.cpp index e418e8b380..89a75b2854 100644 --- a/fpdfsdk/src/pdfwindow/PWL_FontMap.cpp +++ b/fpdfsdk/src/pdfwindow/PWL_FontMap.cpp @@ -9,7 +9,26 @@ #include "core/include/fpdfapi/fpdf_module.h" #include "fpdfsdk/include/pdfwindow/PWL_Wnd.h" -#define DEFAULT_FONT_NAME "Helvetica" +namespace { + +const char kDefaultFontName[] = "Helvetica"; + +const char* const g_sDEStandardFontName[] = {"Courier", + "Courier-Bold", + "Courier-BoldOblique", + "Courier-Oblique", + "Helvetica", + "Helvetica-Bold", + "Helvetica-BoldOblique", + "Helvetica-Oblique", + "Times-Roman", + "Times-Bold", + "Times-Italic", + "Times-BoldItalic", + "Symbol", + "ZapfDingbats"}; + +} // namespace CPWL_FontMap::CPWL_FontMap(IFX_SystemHandler* pSystemHandler) : m_pPDFDoc(NULL), m_pSystemHandler(pSystemHandler) { @@ -151,34 +170,11 @@ void CPWL_FontMap::Empty() { } void CPWL_FontMap::Initialize() { - GetFontIndex(DEFAULT_FONT_NAME, ANSI_CHARSET, FALSE); + GetFontIndex(kDefaultFontName, ANSI_CHARSET, FALSE); } -/* -List of currently supported standard fonts: -Courier, Courier-Bold, Courier-BoldOblique, Courier-Oblique -Helvetica, Helvetica-Bold, Helvetica-BoldOblique, Helvetica-Oblique -Times-Roman, Times-Bold, Times-Italic, Times-BoldItalic -Symbol, ZapfDingbats -*/ - -const char* g_sDEStandardFontName[] = {"Courier", - "Courier-Bold", - "Courier-BoldOblique", - "Courier-Oblique", - "Helvetica", - "Helvetica-Bold", - "Helvetica-BoldOblique", - "Helvetica-Oblique", - "Times-Roman", - "Times-Bold", - "Times-Italic", - "Times-BoldItalic", - "Symbol", - "ZapfDingbats"}; - FX_BOOL CPWL_FontMap::IsStandardFont(const CFX_ByteString& sFontName) { - for (int32_t i = 0; i < 14; i++) { + for (int32_t i = 0; i < FX_ArraySize(g_sDEStandardFontName); ++i) { if (sFontName == g_sDEStandardFontName[i]) return TRUE; } |