| Index: core/include/fxge/fpf.h
|
| diff --git a/core/include/fxge/fpf.h b/core/include/fxge/fpf.h
|
| index 99d9b7c99963c047182b62b93c2d6dfed7d38c07..83587ee9b4531ba2cb6d273c81e1a44cfb176a0b 100644
|
| --- a/core/include/fxge/fpf.h
|
| +++ b/core/include/fxge/fpf.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 _FX_PALTFORM_DEVICE_H_
|
| @@ -9,47 +9,49 @@
|
| class IFPF_DeviceModule;
|
| class IFPF_FontMgr;
|
| class IFPF_Font;
|
| -class IFPF_DeviceModule
|
| -{
|
| -public:
|
| - virtual void Destroy() = 0;
|
| - virtual IFPF_FontMgr* GetFontMgr() = 0;
|
| +class IFPF_DeviceModule {
|
| + public:
|
| + virtual void Destroy() = 0;
|
| + virtual IFPF_FontMgr* GetFontMgr() = 0;
|
| };
|
| -IFPF_DeviceModule* FPF_GetDeviceModule();
|
| -#define FPF_MATCHFONT_REPLACEANSI 1
|
| +IFPF_DeviceModule* FPF_GetDeviceModule();
|
| +#define FPF_MATCHFONT_REPLACEANSI 1
|
| FX_DEFINEHANDLE(FPF_HFONT);
|
| -class IFPF_Font
|
| -{
|
| -public:
|
| - virtual void Release() = 0;
|
| - virtual IFPF_Font* Retain() = 0;
|
| - virtual FPF_HFONT GetHandle() = 0;
|
| - virtual CFX_ByteString GetFamilyName() = 0;
|
| - virtual CFX_WideString GetPsName() = 0;
|
| - virtual FX_DWORD GetFontStyle() const = 0;
|
| - virtual FX_BYTE GetCharset() const = 0;
|
| +class IFPF_Font {
|
| + public:
|
| + virtual void Release() = 0;
|
| + virtual IFPF_Font* Retain() = 0;
|
| + virtual FPF_HFONT GetHandle() = 0;
|
| + virtual CFX_ByteString GetFamilyName() = 0;
|
| + virtual CFX_WideString GetPsName() = 0;
|
| + virtual FX_DWORD GetFontStyle() const = 0;
|
| + virtual FX_BYTE GetCharset() const = 0;
|
|
|
| - virtual FX_INT32 GetGlyphIndex(FX_WCHAR wUnicode) = 0;
|
| - virtual FX_INT32 GetGlyphWidth(FX_INT32 iGlyphIndex) = 0;
|
| + virtual FX_INT32 GetGlyphIndex(FX_WCHAR wUnicode) = 0;
|
| + virtual FX_INT32 GetGlyphWidth(FX_INT32 iGlyphIndex) = 0;
|
|
|
| - virtual FX_INT32 GetAscent() const = 0;
|
| - virtual FX_INT32 GetDescent() const = 0;
|
| + virtual FX_INT32 GetAscent() const = 0;
|
| + virtual FX_INT32 GetDescent() const = 0;
|
|
|
| - virtual FX_BOOL GetGlyphBBox(FX_INT32 iGlyphIndex, FX_RECT &rtBBox) = 0;
|
| - virtual FX_BOOL GetBBox(FX_RECT &rtBBox) = 0;
|
| + virtual FX_BOOL GetGlyphBBox(FX_INT32 iGlyphIndex, FX_RECT& rtBBox) = 0;
|
| + virtual FX_BOOL GetBBox(FX_RECT& rtBBox) = 0;
|
|
|
| - virtual FX_INT32 GetHeight() const = 0;
|
| - virtual FX_INT32 GetItalicAngle() const = 0;
|
| - virtual FX_DWORD GetFontData(FX_DWORD dwTable, FX_LPBYTE pBuffer, FX_DWORD dwSize) = 0;
|
| + virtual FX_INT32 GetHeight() const = 0;
|
| + virtual FX_INT32 GetItalicAngle() const = 0;
|
| + virtual FX_DWORD GetFontData(FX_DWORD dwTable,
|
| + FX_LPBYTE pBuffer,
|
| + FX_DWORD dwSize) = 0;
|
| };
|
| -class IFPF_FontMgr
|
| -{
|
| -public:
|
| - virtual void LoadSystemFonts() = 0;
|
| - virtual void LoadPrivateFont(IFX_FileRead* pFontFile) = 0;
|
| - virtual void LoadPrivateFont(FX_BSTR bsFileName) = 0;
|
| - virtual void LoadPrivateFont(FX_LPVOID pBuffer, size_t szBuffer) = 0;
|
| +class IFPF_FontMgr {
|
| + public:
|
| + virtual void LoadSystemFonts() = 0;
|
| + virtual void LoadPrivateFont(IFX_FileRead* pFontFile) = 0;
|
| + virtual void LoadPrivateFont(FX_BSTR bsFileName) = 0;
|
| + virtual void LoadPrivateFont(FX_LPVOID pBuffer, size_t szBuffer) = 0;
|
|
|
| - virtual IFPF_Font* CreateFont(FX_BSTR bsFamilyname, FX_BYTE charset, FX_DWORD dwStyle, FX_DWORD dwMatch = 0) = 0;
|
| + virtual IFPF_Font* CreateFont(FX_BSTR bsFamilyname,
|
| + FX_BYTE charset,
|
| + FX_DWORD dwStyle,
|
| + FX_DWORD dwMatch = 0) = 0;
|
| };
|
| #endif
|
|
|