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

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

Issue 2032613003: Get rid of NULLs in core/ (Closed) Base URL: https://pdfium.googlesource.com/pdfium@master
Patch Set: Fix a bad merge Created 4 years, 6 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/fxge/android/fpf_skiafontmgr.cpp ('k') | core/fxge/apple/apple_int.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/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_skiafont.h" 11 #include "core/fxge/android/fpf_skiafont.h"
12 #include "core/fxge/android/fpf_skiafontmgr.h" 12 #include "core/fxge/android/fpf_skiafontmgr.h"
13 #include "core/fxge/android/fx_android_font.h" 13 #include "core/fxge/android/fx_android_font.h"
14 14
15 CFX_AndroidFontInfo::CFX_AndroidFontInfo() : m_pFontMgr(NULL) {} 15 CFX_AndroidFontInfo::CFX_AndroidFontInfo() : m_pFontMgr(nullptr) {}
16 FX_BOOL CFX_AndroidFontInfo::Init(CFPF_SkiaFontMgr* pFontMgr) { 16 FX_BOOL CFX_AndroidFontInfo::Init(CFPF_SkiaFontMgr* pFontMgr) {
17 if (!pFontMgr) 17 if (!pFontMgr)
18 return FALSE; 18 return FALSE;
19 19
20 pFontMgr->LoadSystemFonts(); 20 pFontMgr->LoadSystemFonts();
21 m_pFontMgr = pFontMgr; 21 m_pFontMgr = pFontMgr;
22 return TRUE; 22 return TRUE;
23 } 23 }
24 24
25 FX_BOOL CFX_AndroidFontInfo::EnumFontList(CFX_FontMapper* pMapper) { 25 FX_BOOL CFX_AndroidFontInfo::EnumFontList(CFX_FontMapper* pMapper) {
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
84 return; 84 return;
85 85
86 static_cast<CFPF_SkiaFont*>(hFont)->Release(); 86 static_cast<CFPF_SkiaFont*>(hFont)->Release();
87 } 87 }
88 88
89 void* CFX_AndroidFontInfo::RetainFont(void* hFont) { 89 void* CFX_AndroidFontInfo::RetainFont(void* hFont) {
90 return nullptr; 90 return nullptr;
91 } 91 }
92 92
93 #endif // _FX_OS_ == _FX_ANDROID_ 93 #endif // _FX_OS_ == _FX_ANDROID_
OLDNEW
« no previous file with comments | « core/fxge/android/fpf_skiafontmgr.cpp ('k') | core/fxge/apple/apple_int.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698