diff options
| author | Lei Zhang <thestig@chromium.org> | 2015-06-19 17:26:17 -0700 |
|---|---|---|
| committer | Lei Zhang <thestig@chromium.org> | 2015-06-19 17:26:17 -0700 |
| commit | 6d8b1c2c7b1cbada20109f70ae971a4192330bb5 (patch) | |
| tree | e755b7cb2624622cba606134493d25fb7f1ce6c8 /core/src/fxge/apple | |
| parent | 9883a7da2d4f31910073c03e703d5b97a45d9254 (diff) | |
| download | pdfium-6d8b1c2c7b1cbada20109f70ae971a4192330bb5.tar.xz | |
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.
Diffstat (limited to 'core/src/fxge/apple')
| -rw-r--r-- | core/src/fxge/apple/apple_int.h | 4 | ||||
| -rw-r--r-- | core/src/fxge/apple/fx_quartz_device.cpp | 2 |
2 files changed, 2 insertions, 4 deletions
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 0b8353f4b0..c1004d69db 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(); } } |