From 24e733ef26280268ac6ede6d73fac7475aedd1a9 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Fri, 16 Oct 2015 14:18:50 -0700 Subject: 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 . --- core/src/fxge/ge/fx_ge_fontmap.cpp | 6 ------ 1 file changed, 6 deletions(-) (limited to 'core/src/fxge/ge/fx_ge_fontmap.cpp') 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++) { -- cgit v1.2.3