| Index: core/src/fxge/android/fpf_skiafont.h
|
| diff --git a/core/src/fxge/android/fpf_skiafont.h b/core/src/fxge/android/fpf_skiafont.h
|
| index 49819d4c11f7732b10d139746228e97428bd3afb..4a841940dffbd8707cd6973272abed6348c9c2e1 100644
|
| --- a/core/src/fxge/android/fpf_skiafont.h
|
| +++ b/core/src/fxge/android/fpf_skiafont.h
|
| @@ -11,48 +11,48 @@
|
| class CFPF_SkiaFontDescriptor;
|
| class CFPF_SkiaFontMgr;
|
| class SkTypeface;
|
| -class CFPF_SkiaFont : public IFPF_Font
|
| -{
|
| -public:
|
| - CFPF_SkiaFont();
|
| - virtual ~CFPF_SkiaFont();
|
| - virtual void Release();
|
| - virtual IFPF_Font* Retain();
|
| -
|
| - virtual FPF_HFONT GetHandle();
|
| -
|
| - virtual CFX_ByteString GetFamilyName();
|
| - virtual CFX_WideString GetPsName();
|
| -
|
| - virtual FX_DWORD GetFontStyle() const
|
| - {
|
| - return m_dwStyle;
|
| - }
|
| - virtual uint8_t GetCharset() const
|
| - {
|
| - return m_uCharset;
|
| - }
|
| -
|
| - virtual int32_t GetGlyphIndex(FX_WCHAR wUnicode);
|
| - virtual int32_t GetGlyphWidth(int32_t iGlyphIndex);
|
| -
|
| - 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 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);
|
| -protected:
|
| - CFPF_SkiaFontMgr *m_pFontMgr;
|
| - CFPF_SkiaFontDescriptor *m_pFontDes;
|
| - FXFT_Face m_Face;
|
| - FX_DWORD m_dwStyle;
|
| - uint8_t m_uCharset;
|
| - FX_DWORD m_dwRefCount;
|
| +class CFPF_SkiaFont : public IFPF_Font {
|
| + public:
|
| + CFPF_SkiaFont();
|
| + virtual ~CFPF_SkiaFont();
|
| + virtual void Release();
|
| + virtual IFPF_Font* Retain();
|
| +
|
| + virtual FPF_HFONT GetHandle();
|
| +
|
| + virtual CFX_ByteString GetFamilyName();
|
| + virtual CFX_WideString GetPsName();
|
| +
|
| + virtual FX_DWORD GetFontStyle() const { return m_dwStyle; }
|
| + virtual uint8_t GetCharset() const { return m_uCharset; }
|
| +
|
| + virtual int32_t GetGlyphIndex(FX_WCHAR wUnicode);
|
| + virtual int32_t GetGlyphWidth(int32_t iGlyphIndex);
|
| +
|
| + 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 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);
|
| +
|
| + protected:
|
| + CFPF_SkiaFontMgr* m_pFontMgr;
|
| + CFPF_SkiaFontDescriptor* m_pFontDes;
|
| + FXFT_Face m_Face;
|
| + FX_DWORD m_dwStyle;
|
| + uint8_t m_uCharset;
|
| + FX_DWORD m_dwRefCount;
|
| };
|
| #endif
|
|
|
|
|