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/apple/apple_int.h | 4 +--- core/src/fxge/apple/fx_quartz_device.cpp | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'core/src/fxge/apple') diff --git a/core/src/fxge/apple/apple_int.h b/core/src/fxge/apple/apple_int.h index 48476c39a7..715e48d6c2 100644 --- a/core/src/fxge/apple/apple_int.h +++ b/core/src/fxge/apple/apple_int.h @@ -71,9 +71,7 @@ public: } ~CApplePlatform() { - if (m_pFontMapper) { - delete m_pFontMapper; - } + delete m_pFontMapper; } CQuartz2D _quartz2d; IFX_FontMapper* m_pFontMapper; diff --git a/core/src/fxge/apple/fx_quartz_device.cpp b/core/src/fxge/apple/fx_quartz_device.cpp index 8f0f4db6ba..d1e4f544ba 100644 --- a/core/src/fxge/apple/fx_quartz_device.cpp +++ b/core/src/fxge/apple/fx_quartz_device.cpp @@ -1082,7 +1082,7 @@ CFX_QuartzDevice::~CFX_QuartzDevice() if (m_pContext) { CGContextRelease(m_pContext); } - if (GetBitmap() && m_bOwnedBitmap) { + if (m_bOwnedBitmap) { delete GetBitmap(); } } -- cgit v1.2.3