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

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

Issue 1084613006: Fix all remaining instances of FX_NEW. (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master
Patch Set: std::min Created 5 years, 8 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/android/fpf_skiafontmgr.cpp ('k') | core/src/fxge/android/fx_android_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 = FX_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 if (m_pFontMgr) { 21 if (m_pFontMgr) {
22 delete m_pFontMgr; 22 delete m_pFontMgr;
23 } 23 }
24 } 24 }
25 void CFPF_SkiaDeviceModule::Destroy() 25 void CFPF_SkiaDeviceModule::Destroy()
26 { 26 {
27 if (gs_pPFModule) { 27 if (gs_pPFModule) {
28 delete (CFPF_SkiaDeviceModule*)gs_pPFModule; 28 delete (CFPF_SkiaDeviceModule*)gs_pPFModule;
29 gs_pPFModule = NULL; 29 gs_pPFModule = NULL;
30 } 30 }
31 } 31 }
32 IFPF_FontMgr* CFPF_SkiaDeviceModule::GetFontMgr() 32 IFPF_FontMgr* CFPF_SkiaDeviceModule::GetFontMgr()
33 { 33 {
34 if (!m_pFontMgr) { 34 if (!m_pFontMgr) {
35 m_pFontMgr = FX_NEW CFPF_SkiaFontMgr; 35 m_pFontMgr = new CFPF_SkiaFontMgr;
36 if (!m_pFontMgr) {
37 return NULL;
38 }
39 if (!m_pFontMgr->InitFTLibrary()) { 36 if (!m_pFontMgr->InitFTLibrary()) {
40 delete m_pFontMgr; 37 delete m_pFontMgr;
41 return NULL; 38 return NULL;
42 } 39 }
43 } 40 }
44 return (IFPF_FontMgr*)m_pFontMgr; 41 return (IFPF_FontMgr*)m_pFontMgr;
45 } 42 }
46 #endif 43 #endif
OLDNEW
« no previous file with comments | « core/src/fxge/android/fpf_skiafontmgr.cpp ('k') | core/src/fxge/android/fx_android_imp.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698