diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-10-16 14:18:50 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-10-16 14:18:50 -0700 |
| commit | 24e733ef26280268ac6ede6d73fac7475aedd1a9 (patch) | |
| tree | b067396d52855d4e7a63d040fd99029f76ac6b94 /core/src/fxge/ge | |
| parent | db0be96179f0cd5f1787564cbccf86320a4d54ae (diff) | |
| download | pdfium-24e733ef26280268ac6ede6d73fac7475aedd1a9.tar.xz | |
fxcrt convergence - XFA side.
Take extern tables portion only of fx_bidi change.
Take itoa fixes and corresponding unit test.
Merge typo in skia font mgr.
Kill some null checks after new.
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1409223002 .
Diffstat (limited to 'core/src/fxge/ge')
| -rw-r--r-- | core/src/fxge/ge/fx_ge_fontmap.cpp | 6 | ||||
| -rw-r--r-- | core/src/fxge/ge/fx_ge_linux.cpp | 6 |
2 files changed, 3 insertions, 9 deletions
diff --git a/core/src/fxge/ge/fx_ge_fontmap.cpp b/core/src/fxge/ge/fx_ge_fontmap.cpp index e9c9d768c8..b332ffdea2 100644 --- a/core/src/fxge/ge/fx_ge_fontmap.cpp +++ b/core/src/fxge/ge/fx_ge_fontmap.cpp @@ -138,9 +138,6 @@ FXFT_Face CFX_FontMgr::AddCachedFace(const CFX_ByteString& face_name, FX_DWORD size, int face_index) { CTTFontDesc* pFontDesc = new CTTFontDesc; - if (!pFontDesc) { - return NULL; - } pFontDesc->m_Type = 1; pFontDesc->m_SingleFace.m_pFace = NULL; pFontDesc->m_SingleFace.m_bBold = weight; @@ -336,9 +333,6 @@ FXFT_Face CFX_FontMgr::AddCachedTTCFace(int ttc_size, FX_DWORD size, int font_offset) { CTTFontDesc* pFontDesc = new CTTFontDesc; - if (!pFontDesc) { - return NULL; - } pFontDesc->m_Type = 2; pFontDesc->m_pFontData = pData; for (int i = 0; i < 16; i++) { diff --git a/core/src/fxge/ge/fx_ge_linux.cpp b/core/src/fxge/ge/fx_ge_linux.cpp index 609777fbb5..72971f7f5d 100644 --- a/core/src/fxge/ge/fx_ge_linux.cpp +++ b/core/src/fxge/ge/fx_ge_linux.cpp @@ -91,7 +91,7 @@ void* CFX_LinuxFontInfo::MapFont(int weight, } } break; case FXFONT_GB2312_CHARSET: { - for (int32_t i = 0; i < FX_ArraySize(g_LinuxGbFontList); ++i) { + for (size_t i = 0; i < FX_ArraySize(g_LinuxGbFontList); ++i) { auto it = m_FontList.find(g_LinuxGbFontList[i]); if (it != m_FontList.end()) { return it->second; @@ -99,7 +99,7 @@ void* CFX_LinuxFontInfo::MapFont(int weight, } } break; case FXFONT_CHINESEBIG5_CHARSET: { - for (int32_t i = 0; i < FX_ArraySize(g_LinuxB5FontList); ++i) { + for (size_t i = 0; i < FX_ArraySize(g_LinuxB5FontList); ++i) { auto it = m_FontList.find(g_LinuxB5FontList[i]); if (it != m_FontList.end()) { return it->second; @@ -107,7 +107,7 @@ void* CFX_LinuxFontInfo::MapFont(int weight, } } break; case FXFONT_HANGEUL_CHARSET: { - for (int32_t i = 0; i < FX_ArraySize(g_LinuxHGFontList); ++i) { + for (size_t i = 0; i < FX_ArraySize(g_LinuxHGFontList); ++i) { auto it = m_FontList.find(g_LinuxHGFontList[i]); if (it != m_FontList.end()) { return it->second; |