diff options
author | Tom Sepez <tsepez@chromium.org> | 2015-06-09 13:24:12 -0700 |
---|---|---|
committer | Tom Sepez <tsepez@chromium.org> | 2015-06-09 13:24:12 -0700 |
commit | bfa9a824a20f37c2dd7111012b46c929cf2ed8a0 (patch) | |
tree | 4cfbe682869d89900f33751c37f6a84865beeb0a /core/src/fxge/android/fpf_skiafont.h | |
parent | b116136da234afcad018bb44a3ccb64b9ad2a554 (diff) | |
download | pdfium-bfa9a824a20f37c2dd7111012b46c929cf2ed8a0.tar.xz |
Merge to XFA: Use stdint.h types throughout PDFium.
Near-automatic merge, plus re-running scripts to update
additional usage.
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1172793002
Diffstat (limited to 'core/src/fxge/android/fpf_skiafont.h')
-rw-r--r-- | core/src/fxge/android/fpf_skiafont.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/core/src/fxge/android/fpf_skiafont.h b/core/src/fxge/android/fpf_skiafont.h index 135c830c95..72b569fe2e 100644 --- a/core/src/fxge/android/fpf_skiafont.h +++ b/core/src/fxge/android/fpf_skiafont.h @@ -28,30 +28,30 @@ public: { return m_dwStyle; } - virtual FX_BYTE GetCharset() const + virtual uint8_t GetCharset() const { return m_uCharset; } - virtual FX_INT32 GetGlyphIndex(FX_WCHAR wUnicode); - virtual FX_INT32 GetGlyphWidth(FX_INT32 iGlyphIndex); + virtual int32_t GetGlyphIndex(FX_WCHAR wUnicode); + virtual int32_t GetGlyphWidth(int32_t iGlyphIndex); - virtual FX_INT32 GetAscent() const; - virtual FX_INT32 GetDescent() const; + virtual int32_t GetAscent() const; + virtual int32_t GetDescent() const; - virtual FX_BOOL GetGlyphBBox(FX_INT32 iGlyphIndex, FX_RECT &rtBBox); + virtual FX_BOOL GetGlyphBBox(int32_t iGlyphIndex, FX_RECT &rtBBox); virtual FX_BOOL GetBBox(FX_RECT &rtBBox); - virtual FX_INT32 GetHeight() const; - virtual FX_INT32 GetItalicAngle() const; + virtual int32_t GetHeight() const; + virtual int32_t GetItalicAngle() const; virtual FX_DWORD GetFontData(FX_DWORD dwTable, FX_LPBYTE pBuffer, FX_DWORD dwSize); - FX_BOOL InitFont(CFPF_SkiaFontMgr *pFontMgr, CFPF_SkiaFontDescriptor *pFontDes, FX_BSTR bsFamily, FX_DWORD dwStyle, FX_BYTE uCharset); + FX_BOOL InitFont(CFPF_SkiaFontMgr *pFontMgr, CFPF_SkiaFontDescriptor *pFontDes, FX_BSTR bsFamily, FX_DWORD dwStyle, uint8_t uCharset); protected: CFPF_SkiaFontMgr *m_pFontMgr; CFPF_SkiaFontDescriptor *m_pFontDes; FXFT_Face m_Face; FX_DWORD m_dwStyle; - FX_BYTE m_uCharset; + uint8_t m_uCharset; FX_DWORD m_dwRefCount; }; #endif |