summaryrefslogtreecommitdiff
path: root/core/fxge/android/cfpf_skiafontmgr.h
diff options
context:
space:
mode:
authorLei Zhang <thestig@chromium.org>2018-08-17 18:07:43 +0000
committerChromium commit bot <commit-bot@chromium.org>2018-08-17 18:07:43 +0000
commit1f867bb6e2c7b42e529c907053e0b9aecdd219ac (patch)
tree63cafaabd6d69c46e4a91e3035f54e3ec48f368e /core/fxge/android/cfpf_skiafontmgr.h
parent20736f7f5884cf1e2827543c92b6e47f8282aeaf (diff)
downloadpdfium-1f867bb6e2c7b42e529c907053e0b9aecdd219ac.tar.xz
Remove default arguments from CFPF_SkiaFontMgr.
Fix some nits as well. Change-Id: Idfe3e737bc737fe4ad42581aa735398fdc0ebab5 Reviewed-on: https://pdfium-review.googlesource.com/40510 Reviewed-by: Tom Sepez <tsepez@chromium.org> Commit-Queue: Lei Zhang <thestig@chromium.org>
Diffstat (limited to 'core/fxge/android/cfpf_skiafontmgr.h')
-rw-r--r--core/fxge/android/cfpf_skiafontmgr.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/core/fxge/android/cfpf_skiafontmgr.h b/core/fxge/android/cfpf_skiafontmgr.h
index 11ad47a360..5e0bce2d78 100644
--- a/core/fxge/android/cfpf_skiafontmgr.h
+++ b/core/fxge/android/cfpf_skiafontmgr.h
@@ -28,23 +28,23 @@ class CFPF_SkiaFontMgr {
CFPF_SkiaFont* CreateFont(const ByteStringView& bsFamilyname,
uint8_t uCharset,
uint32_t dwStyle,
- uint32_t dwMatch = 0);
+ uint32_t dwMatch);
bool InitFTLibrary();
FXFT_Face GetFontFace(const RetainPtr<IFX_SeekableReadStream>& pFileRead,
- int32_t iFaceIndex = 0);
- FXFT_Face GetFontFace(const ByteStringView& bsFile, int32_t iFaceIndex = 0);
+ int32_t iFaceIndex);
+ FXFT_Face GetFontFace(const ByteStringView& bsFile, int32_t iFaceIndex);
FXFT_Face GetFontFace(const uint8_t* pBuffer,
size_t szBuffer,
- int32_t iFaceIndex = 0);
+ int32_t iFaceIndex);
private:
void ScanPath(const ByteString& path);
void ScanFile(const ByteString& file);
void ReportFace(FXFT_Face face, CFPF_SkiaFontDescriptor* pFontDesc);
- bool m_bLoaded;
- FXFT_Library m_FTLibrary;
+ bool m_bLoaded = false;
+ FXFT_Library m_FTLibrary = nullptr;
std::vector<CFPF_SkiaFontDescriptor*> m_FontFaces;
std::map<uint32_t, CFPF_SkiaFont*> m_FamilyFonts;
};