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

Unified Diff: core/fxge/android/fpf_skiafontmgr.h

Issue 2433543002: Clean up fpf_skiafontmgr (Closed)
Patch Set: FX_ArraySize not working Created 4 years, 2 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 side-by-side diff with in-line comments
Download patch
Index: core/fxge/android/fpf_skiafontmgr.h
diff --git a/core/fxge/android/fpf_skiafontmgr.h b/core/fxge/android/fpf_skiafontmgr.h
index 897e21f981dd8d458b47026220e3e4a5654553e5..2797ca005eee5f8eb956418fecb74b2f1a331d95 100644
--- a/core/fxge/android/fpf_skiafontmgr.h
+++ b/core/fxge/android/fpf_skiafontmgr.h
@@ -95,28 +95,25 @@ class CFPF_SkiaFontMgr {
~CFPF_SkiaFontMgr();
void LoadSystemFonts();
- void LoadPrivateFont(IFX_FileRead* pFontFile);
- void LoadPrivateFont(const CFX_ByteStringC& bsFileName);
- void LoadPrivateFont(void* pBuffer, size_t szBuffer);
CFPF_SkiaFont* CreateFont(const CFX_ByteStringC& bsFamilyname,
uint8_t uCharset,
uint32_t dwStyle,
uint32_t dwMatch = 0);
- FX_BOOL InitFTLibrary();
+ bool InitFTLibrary();
FXFT_Face GetFontFace(IFX_FileRead* pFileRead, int32_t iFaceIndex = 0);
FXFT_Face GetFontFace(const CFX_ByteStringC& bsFile, int32_t iFaceIndex = 0);
FXFT_Face GetFontFace(const uint8_t* pBuffer,
size_t szBuffer,
int32_t iFaceIndex = 0);
- protected:
+ private:
void ScanPath(const CFX_ByteString& path);
void ScanFile(const CFX_ByteString& file);
void ReportFace(FXFT_Face face, CFPF_SkiaFontDescriptor* pFontDesc);
void OutputSystemFonts();
- FX_BOOL m_bLoaded;
+ bool m_bLoaded;
FXFT_Library m_FTLibrary;
std::vector<CFPF_SkiaFontDescriptor*> m_FontFaces;
std::map<uint32_t, CFPF_SkiaFont*> m_FamilyFonts;

Powered by Google App Engine
This is Rietveld 408576698