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/android | |
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/android')
-rw-r--r-- | core/src/fxge/android/fpf_skiafontmgr.cpp | 2 | ||||
-rw-r--r-- | core/src/fxge/android/fpf_skiamodule.cpp | 3 | ||||
-rw-r--r-- | core/src/fxge/android/fx_android_imp.cpp | 3 |
3 files changed, 1 insertions, 7 deletions
diff --git a/core/src/fxge/android/fpf_skiafontmgr.cpp b/core/src/fxge/android/fpf_skiafontmgr.cpp index 521460bea3..7e7aee3c06 100644 --- a/core/src/fxge/android/fpf_skiafontmgr.cpp +++ b/core/src/fxge/android/fpf_skiafontmgr.cpp @@ -337,7 +337,7 @@ IFPF_Font* CFPF_SkiaFontMgr::CreateFont(const CFX_ByteStringC& bsFamilyname, m_FamilyFonts.SetAt((void*)(uintptr_t)dwHash, (void*)pFont); return pFont->Retain(); } - pFont->Release() + pFont->Release(); } return NULL; } diff --git a/core/src/fxge/android/fpf_skiamodule.cpp b/core/src/fxge/android/fpf_skiamodule.cpp index a421a0e944..fdc3398d30 100644 --- a/core/src/fxge/android/fpf_skiamodule.cpp +++ b/core/src/fxge/android/fpf_skiamodule.cpp @@ -25,9 +25,6 @@ void CFPF_SkiaDeviceModule::Destroy() { IFPF_FontMgr* CFPF_SkiaDeviceModule::GetFontMgr() { if (!m_pFontMgr) { m_pFontMgr = new CFPF_SkiaFontMgr; - if (!m_pFontMgr) { - return NULL; - } if (!m_pFontMgr->InitFTLibrary()) { delete m_pFontMgr; return NULL; diff --git a/core/src/fxge/android/fx_android_imp.cpp b/core/src/fxge/android/fx_android_imp.cpp index 43fe3b197f..073a665560 100644 --- a/core/src/fxge/android/fx_android_imp.cpp +++ b/core/src/fxge/android/fx_android_imp.cpp @@ -14,9 +14,6 @@ void CFX_GEModule::InitPlatform() { IFPF_FontMgr* pFontMgr = pDeviceModule->GetFontMgr(); if (pFontMgr) { CFX_AndroidFontInfo* pFontInfo = new CFX_AndroidFontInfo; - if (!pFontInfo) { - return; - } pFontInfo->Init(pFontMgr); m_pFontMgr->SetSystemFontInfo(pFontInfo); } |