| 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 1d1073c1fe48cb4f4a7e9e3e0894168508e1748a..03604ccc4223c5f26afd8f3c72c1fe42758f8d09 100644
|
| --- a/core/src/fxge/android/fpf_skiafont.h
|
| +++ b/core/src/fxge/android/fpf_skiafont.h
|
| @@ -1,7 +1,7 @@
|
| // Copyright 2014 PDFium Authors. All rights reserved.
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
| -
|
| +
|
| // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
|
|
|
| #ifndef _FPF_SKIA_FONT_H_
|
| @@ -10,48 +10,48 @@
|
| class CFPF_SkiaFontDescriptor;
|
| class CFPF_SkiaFontMgr;
|
| class SkTypeface;
|
| -class CFPF_SkiaFont : public IFPF_Font, public CFX_Object
|
| -{
|
| -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 FX_BYTE GetCharset() const
|
| - {
|
| - return m_uCharset;
|
| - }
|
| -
|
| - virtual FX_INT32 GetGlyphIndex(FX_WCHAR wUnicode);
|
| - virtual FX_INT32 GetGlyphWidth(FX_INT32 iGlyphIndex);
|
| -
|
| - virtual FX_INT32 GetAscent() const;
|
| - virtual FX_INT32 GetDescent() const;
|
| -
|
| - virtual FX_BOOL GetGlyphBBox(FX_INT32 iGlyphIndex, FX_RECT &rtBBox);
|
| - virtual FX_BOOL GetBBox(FX_RECT &rtBBox);
|
| -
|
| - virtual FX_INT32 GetHeight() const;
|
| - virtual FX_INT32 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);
|
| -protected:
|
| - CFPF_SkiaFontMgr *m_pFontMgr;
|
| - CFPF_SkiaFontDescriptor *m_pFontDes;
|
| - FXFT_Face m_Face;
|
| - FX_DWORD m_dwStyle;
|
| - FX_BYTE m_uCharset;
|
| - FX_DWORD m_dwRefCount;
|
| +class CFPF_SkiaFont : public IFPF_Font, public CFX_Object {
|
| + 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 FX_BYTE GetCharset() const { return m_uCharset; }
|
| +
|
| + virtual FX_INT32 GetGlyphIndex(FX_WCHAR wUnicode);
|
| + virtual FX_INT32 GetGlyphWidth(FX_INT32 iGlyphIndex);
|
| +
|
| + virtual FX_INT32 GetAscent() const;
|
| + virtual FX_INT32 GetDescent() const;
|
| +
|
| + virtual FX_BOOL GetGlyphBBox(FX_INT32 iGlyphIndex, FX_RECT& rtBBox);
|
| + virtual FX_BOOL GetBBox(FX_RECT& rtBBox);
|
| +
|
| + virtual FX_INT32 GetHeight() const;
|
| + virtual FX_INT32 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);
|
| +
|
| + protected:
|
| + CFPF_SkiaFontMgr* m_pFontMgr;
|
| + CFPF_SkiaFontDescriptor* m_pFontDes;
|
| + FXFT_Face m_Face;
|
| + FX_DWORD m_dwStyle;
|
| + FX_BYTE m_uCharset;
|
| + FX_DWORD m_dwRefCount;
|
| };
|
| #endif
|
| #endif
|
|
|