From cfac954abcab7caf47d3fa3d641c553cba998271 Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Fri, 19 Jun 2015 14:51:10 -0700 Subject: Cleanup: Do not check pointers before deleting them. R=tsepez@chromium.org Review URL: https://codereview.chromium.org/1192743004. --- core/src/fxge/android/fpf_skiafontmgr.cpp | 4 +--- core/src/fxge/android/fpf_skiamodule.cpp | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) (limited to 'core/src/fxge/android') diff --git a/core/src/fxge/android/fpf_skiafontmgr.cpp b/core/src/fxge/android/fpf_skiafontmgr.cpp index ec7af81e79..86bb052435 100644 --- a/core/src/fxge/android/fpf_skiafontmgr.cpp +++ b/core/src/fxge/android/fpf_skiafontmgr.cpp @@ -245,9 +245,7 @@ CFPF_SkiaFontMgr::~CFPF_SkiaFontMgr() m_FamilyFonts.RemoveAll(); for (int32_t i = m_FontFaces.GetUpperBound(); i >= 0; i--) { CFPF_SkiaFontDescriptor *pFont = (CFPF_SkiaFontDescriptor*)m_FontFaces.ElementAt(i); - if (pFont) { - delete pFont; - } + delete pFont; } m_FontFaces.RemoveAll(); if (m_FTLibrary) { diff --git a/core/src/fxge/android/fpf_skiamodule.cpp b/core/src/fxge/android/fpf_skiamodule.cpp index e6fded6317..37bfd9cabb 100644 --- a/core/src/fxge/android/fpf_skiamodule.cpp +++ b/core/src/fxge/android/fpf_skiamodule.cpp @@ -18,9 +18,7 @@ IFPF_DeviceModule* FPF_GetDeviceModule() } CFPF_SkiaDeviceModule::~CFPF_SkiaDeviceModule() { - if (m_pFontMgr) { - delete m_pFontMgr; - } + delete m_pFontMgr; } void CFPF_SkiaDeviceModule::Destroy() { -- cgit v1.2.3