Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(24)

Side by Side Diff: core/src/fxge/android/fpf_skiamodule.cpp

Issue 1195363002: Cleanup: Do not check pointers before deleting them, part 2. (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master
Patch Set: nits Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « core/src/fxge/agg/src/fx_agg_driver.cpp ('k') | core/src/fxge/apple/fx_mac_imp.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 PDFium Authors. All rights reserved. 1 // Copyright 2014 PDFium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com 5 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
6 6
7 #include "fx_fpf.h" 7 #include "fx_fpf.h"
8 #if _FX_OS_ == _FX_ANDROID_ 8 #if _FX_OS_ == _FX_ANDROID_
9 #include "fpf_skiamodule.h" 9 #include "fpf_skiamodule.h"
10 #include "fpf_skiafontmgr.h" 10 #include "fpf_skiafontmgr.h"
11 static IFPF_DeviceModule *gs_pPFModule = NULL; 11 static IFPF_DeviceModule *gs_pPFModule = NULL;
12 IFPF_DeviceModule* FPF_GetDeviceModule() 12 IFPF_DeviceModule* FPF_GetDeviceModule()
13 { 13 {
14 if (!gs_pPFModule) { 14 if (!gs_pPFModule) {
15 gs_pPFModule = new CFPF_SkiaDeviceModule; 15 gs_pPFModule = new CFPF_SkiaDeviceModule;
16 } 16 }
17 return gs_pPFModule; 17 return gs_pPFModule;
18 } 18 }
19 CFPF_SkiaDeviceModule::~CFPF_SkiaDeviceModule() 19 CFPF_SkiaDeviceModule::~CFPF_SkiaDeviceModule()
20 { 20 {
21 delete m_pFontMgr; 21 delete m_pFontMgr;
22 } 22 }
23 void CFPF_SkiaDeviceModule::Destroy() 23 void CFPF_SkiaDeviceModule::Destroy()
24 { 24 {
25 if (gs_pPFModule) { 25 delete (CFPF_SkiaDeviceModule*)gs_pPFModule;
26 delete (CFPF_SkiaDeviceModule*)gs_pPFModule; 26 gs_pPFModule = NULL;
27 gs_pPFModule = NULL;
28 }
29 } 27 }
30 IFPF_FontMgr* CFPF_SkiaDeviceModule::GetFontMgr() 28 IFPF_FontMgr* CFPF_SkiaDeviceModule::GetFontMgr()
31 { 29 {
32 if (!m_pFontMgr) { 30 if (!m_pFontMgr) {
33 m_pFontMgr = new CFPF_SkiaFontMgr; 31 m_pFontMgr = new CFPF_SkiaFontMgr;
34 if (!m_pFontMgr->InitFTLibrary()) { 32 if (!m_pFontMgr->InitFTLibrary()) {
35 delete m_pFontMgr; 33 delete m_pFontMgr;
36 return NULL; 34 return NULL;
37 } 35 }
38 } 36 }
39 return (IFPF_FontMgr*)m_pFontMgr; 37 return (IFPF_FontMgr*)m_pFontMgr;
40 } 38 }
41 #endif 39 #endif
OLDNEW
« no previous file with comments | « core/src/fxge/agg/src/fx_agg_driver.cpp ('k') | core/src/fxge/apple/fx_mac_imp.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698