From 6d8b1c2c7b1cbada20109f70ae971a4192330bb5 Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Fri, 19 Jun 2015 17:26:17 -0700 Subject: Merge to XFA: Cleanup: Do not check pointers before deleting them. R=tsepez@chromium.org Review URL: https://codereview.chromium.org/1192743004. (cherry picked from commit cfac954abcab7caf47d3fa3d641c553cba998271) Review URL: https://codereview.chromium.org/1196783003. --- core/src/fxge/ge/fx_ge_device.cpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'core/src/fxge/ge/fx_ge_device.cpp') diff --git a/core/src/fxge/ge/fx_ge_device.cpp b/core/src/fxge/ge/fx_ge_device.cpp index b4a4a89595..793dfc5ee2 100644 --- a/core/src/fxge/ge/fx_ge_device.cpp +++ b/core/src/fxge/ge/fx_ge_device.cpp @@ -12,15 +12,11 @@ CFX_RenderDevice::CFX_RenderDevice() } CFX_RenderDevice::~CFX_RenderDevice() { - if (m_pDeviceDriver) { - delete m_pDeviceDriver; - } + delete m_pDeviceDriver; } void CFX_RenderDevice::SetDeviceDriver(IFX_RenderDeviceDriver* pDriver) { - if (m_pDeviceDriver) { - delete m_pDeviceDriver; - } + delete m_pDeviceDriver; m_pDeviceDriver = pDriver; InitDeviceInfo(); } -- cgit v1.2.3