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

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

Issue 1881043004: Cleanup IFPF_* interfaces. (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master
Patch Set: Created 4 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
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 "core/fxcrt/include/fx_system.h" 7 #include "core/fxcrt/include/fx_system.h"
8 8
9 #if _FX_OS_ == _FX_ANDROID_ 9 #if _FX_OS_ == _FX_ANDROID_
10 10
11 #include "core/fxge/android/fpf_skiafontmgr.h" 11 #include "core/fxge/android/fpf_skiafontmgr.h"
12 #include "core/fxge/android/fpf_skiamodule.h" 12 #include "core/fxge/android/fpf_skiamodule.h"
13 13
14 static IFPF_DeviceModule* gs_pPFModule = NULL; 14 namespace {
15 IFPF_DeviceModule* FPF_GetDeviceModule() { 15
16 if (!gs_pPFModule) { 16 CFPF_SkiaDeviceModule* gs_pPFModule = nullptr;
17
18 } // namespace
19
20 CFPF_SkiaDeviceModule* CFPF_GetSkiaDeviceModule() {
21 if (!gs_pPFModule)
17 gs_pPFModule = new CFPF_SkiaDeviceModule; 22 gs_pPFModule = new CFPF_SkiaDeviceModule;
18 }
19 return gs_pPFModule; 23 return gs_pPFModule;
20 } 24 }
25
21 CFPF_SkiaDeviceModule::~CFPF_SkiaDeviceModule() { 26 CFPF_SkiaDeviceModule::~CFPF_SkiaDeviceModule() {
22 delete m_pFontMgr; 27 delete m_pFontMgr;
23 } 28 }
29
24 void CFPF_SkiaDeviceModule::Destroy() { 30 void CFPF_SkiaDeviceModule::Destroy() {
25 delete (CFPF_SkiaDeviceModule*)gs_pPFModule; 31 delete gs_pPFModule;
26 gs_pPFModule = NULL; 32 gs_pPFModule = nullptr;
27 } 33 }
28 IFPF_FontMgr* CFPF_SkiaDeviceModule::GetFontMgr() { 34
35 CFPF_SkiaFontMgr* CFPF_SkiaDeviceModule::GetFontMgr() {
29 if (!m_pFontMgr) { 36 if (!m_pFontMgr) {
30 m_pFontMgr = new CFPF_SkiaFontMgr; 37 m_pFontMgr = new CFPF_SkiaFontMgr;
31 if (!m_pFontMgr->InitFTLibrary()) { 38 if (!m_pFontMgr->InitFTLibrary()) {
32 delete m_pFontMgr; 39 delete m_pFontMgr;
33 return NULL; 40 return nullptr;
34 } 41 }
35 } 42 }
36 return (IFPF_FontMgr*)m_pFontMgr; 43 return m_pFontMgr;
37 } 44 }
38 #endif 45
46 #endif // _FX_OS_ == _FX_ANDROID_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698