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

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

Issue 1748803002: Remove fx_fpf.h and IWYU (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master
Patch Set: Rebase to master Created 4 years, 9 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_font.h » ('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 "core/src/fxge/android/fx_fpf.h" 7 #include "core/include/fxcrt/fx_system.h"
8
8 #if _FX_OS_ == _FX_ANDROID_ 9 #if _FX_OS_ == _FX_ANDROID_
10
9 #include "core/src/fxge/android/fpf_skiafontmgr.h" 11 #include "core/src/fxge/android/fpf_skiafontmgr.h"
10 #include "core/src/fxge/android/fpf_skiamodule.h" 12 #include "core/src/fxge/android/fpf_skiamodule.h"
13
11 static IFPF_DeviceModule* gs_pPFModule = NULL; 14 static IFPF_DeviceModule* gs_pPFModule = NULL;
12 IFPF_DeviceModule* FPF_GetDeviceModule() { 15 IFPF_DeviceModule* FPF_GetDeviceModule() {
13 if (!gs_pPFModule) { 16 if (!gs_pPFModule) {
14 gs_pPFModule = new CFPF_SkiaDeviceModule; 17 gs_pPFModule = new CFPF_SkiaDeviceModule;
15 } 18 }
16 return gs_pPFModule; 19 return gs_pPFModule;
17 } 20 }
18 CFPF_SkiaDeviceModule::~CFPF_SkiaDeviceModule() { 21 CFPF_SkiaDeviceModule::~CFPF_SkiaDeviceModule() {
19 delete m_pFontMgr; 22 delete m_pFontMgr;
20 } 23 }
21 void CFPF_SkiaDeviceModule::Destroy() { 24 void CFPF_SkiaDeviceModule::Destroy() {
22 delete (CFPF_SkiaDeviceModule*)gs_pPFModule; 25 delete (CFPF_SkiaDeviceModule*)gs_pPFModule;
23 gs_pPFModule = NULL; 26 gs_pPFModule = NULL;
24 } 27 }
25 IFPF_FontMgr* CFPF_SkiaDeviceModule::GetFontMgr() { 28 IFPF_FontMgr* CFPF_SkiaDeviceModule::GetFontMgr() {
26 if (!m_pFontMgr) { 29 if (!m_pFontMgr) {
27 m_pFontMgr = new CFPF_SkiaFontMgr; 30 m_pFontMgr = new CFPF_SkiaFontMgr;
28 if (!m_pFontMgr->InitFTLibrary()) { 31 if (!m_pFontMgr->InitFTLibrary()) {
29 delete m_pFontMgr; 32 delete m_pFontMgr;
30 return NULL; 33 return NULL;
31 } 34 }
32 } 35 }
33 return (IFPF_FontMgr*)m_pFontMgr; 36 return (IFPF_FontMgr*)m_pFontMgr;
34 } 37 }
35 #endif 38 #endif
OLDNEW
« no previous file with comments | « core/src/fxge/android/fpf_skiafontmgr.cpp ('k') | core/src/fxge/android/fx_android_font.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698