diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-07-27 11:55:29 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-07-27 11:55:29 -0700 |
| commit | ff46aaf499edcf153ee2f57c7016587aa96dcfa0 (patch) | |
| tree | 0a0d92713af476897899b126d180cc6294433d10 /core/src/fxge/android/fpf_skiafont.h | |
| parent | aafeff816e22c1333c17d8a0eb4fe8927c28142d (diff) | |
| download | pdfium-ff46aaf499edcf153ee2f57c7016587aa96dcfa0.tar.xz | |
FX Bool considered harmful, part 3
Try to reland this patch after fixing underlying issues that
caused it to be reverted.
fx_system.h is the only manual edit.
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1258093002 .
Diffstat (limited to 'core/src/fxge/android/fpf_skiafont.h')
| -rw-r--r-- | core/src/fxge/android/fpf_skiafont.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/src/fxge/android/fpf_skiafont.h b/core/src/fxge/android/fpf_skiafont.h index 49819d4c11..90cf5cb29c 100644 --- a/core/src/fxge/android/fpf_skiafont.h +++ b/core/src/fxge/android/fpf_skiafont.h @@ -39,13 +39,13 @@ public: virtual int32_t GetAscent() const; virtual int32_t GetDescent() const; - virtual FX_BOOL GetGlyphBBox(int32_t iGlyphIndex, FX_RECT &rtBBox); - virtual FX_BOOL GetBBox(FX_RECT &rtBBox); + virtual bool GetGlyphBBox(int32_t iGlyphIndex, FX_RECT &rtBBox); + virtual bool GetBBox(FX_RECT &rtBBox); virtual int32_t GetHeight() const; virtual int32_t GetItalicAngle() const; virtual FX_DWORD GetFontData(FX_DWORD dwTable, uint8_t* pBuffer, FX_DWORD dwSize); - FX_BOOL InitFont(CFPF_SkiaFontMgr *pFontMgr, CFPF_SkiaFontDescriptor *pFontDes, const CFX_ByteStringC& bsFamily, FX_DWORD dwStyle, uint8_t uCharset); + bool InitFont(CFPF_SkiaFontMgr *pFontMgr, CFPF_SkiaFontDescriptor *pFontDes, const CFX_ByteStringC& bsFamily, FX_DWORD dwStyle, uint8_t uCharset); protected: CFPF_SkiaFontMgr *m_pFontMgr; CFPF_SkiaFontDescriptor *m_pFontDes; |