Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(59)

Side by Side Diff: core/fxge/android/fpf_skiafontmgr.h

Issue 1832173003: Remove FX_DWORD from core/ and delete definition (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master
Patch Set: Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « core/fxge/android/fpf_skiafont.cpp ('k') | core/fxge/android/fpf_skiafontmgr.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 PDFium Authors. All rights reserved. 1 // Copyright 2014 PDFium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com 5 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
6 6
7 #ifndef CORE_FXGE_ANDROID_FPF_SKIAFONTMGR_H_ 7 #ifndef CORE_FXGE_ANDROID_FPF_SKIAFONTMGR_H_
8 #define CORE_FXGE_ANDROID_FPF_SKIAFONTMGR_H_ 8 #define CORE_FXGE_ANDROID_FPF_SKIAFONTMGR_H_
9 9
10 #include "core/fxcrt/include/fx_system.h" 10 #include "core/fxcrt/include/fx_system.h"
(...skipping 26 matching lines...) Expand all
37 virtual int32_t GetType() const { return FPF_SKIAFONTTYPE_Unknown; } 37 virtual int32_t GetType() const { return FPF_SKIAFONTTYPE_Unknown; }
38 38
39 void SetFamily(const FX_CHAR* pFamily) { 39 void SetFamily(const FX_CHAR* pFamily) {
40 FX_Free(m_pFamily); 40 FX_Free(m_pFamily);
41 int32_t iSize = FXSYS_strlen(pFamily); 41 int32_t iSize = FXSYS_strlen(pFamily);
42 m_pFamily = FX_Alloc(FX_CHAR, iSize + 1); 42 m_pFamily = FX_Alloc(FX_CHAR, iSize + 1);
43 FXSYS_memcpy(m_pFamily, pFamily, iSize * sizeof(FX_CHAR)); 43 FXSYS_memcpy(m_pFamily, pFamily, iSize * sizeof(FX_CHAR));
44 m_pFamily[iSize] = 0; 44 m_pFamily[iSize] = 0;
45 } 45 }
46 FX_CHAR* m_pFamily; 46 FX_CHAR* m_pFamily;
47 FX_DWORD m_dwStyle; 47 uint32_t m_dwStyle;
48 int32_t m_iFaceIndex; 48 int32_t m_iFaceIndex;
49 FX_DWORD m_dwCharsets; 49 uint32_t m_dwCharsets;
50 int32_t m_iGlyphNum; 50 int32_t m_iGlyphNum;
51 }; 51 };
52 52
53 class CFPF_SkiaPathFont : public CFPF_SkiaFontDescriptor { 53 class CFPF_SkiaPathFont : public CFPF_SkiaFontDescriptor {
54 public: 54 public:
55 CFPF_SkiaPathFont() : m_pPath(NULL) {} 55 CFPF_SkiaPathFont() : m_pPath(NULL) {}
56 ~CFPF_SkiaPathFont() override { FX_Free(m_pPath); } 56 ~CFPF_SkiaPathFont() override { FX_Free(m_pPath); }
57 57
58 // CFPF_SkiaFontDescriptor 58 // CFPF_SkiaFontDescriptor
59 int32_t GetType() const override { return FPF_SKIAFONTTYPE_Path; } 59 int32_t GetType() const override { return FPF_SKIAFONTTYPE_Path; }
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
93 CFPF_SkiaFontMgr(); 93 CFPF_SkiaFontMgr();
94 ~CFPF_SkiaFontMgr() override; 94 ~CFPF_SkiaFontMgr() override;
95 95
96 // IFPF_FontMgr 96 // IFPF_FontMgr
97 void LoadSystemFonts() override; 97 void LoadSystemFonts() override;
98 void LoadPrivateFont(IFX_FileRead* pFontFile) override; 98 void LoadPrivateFont(IFX_FileRead* pFontFile) override;
99 void LoadPrivateFont(const CFX_ByteStringC& bsFileName) override; 99 void LoadPrivateFont(const CFX_ByteStringC& bsFileName) override;
100 void LoadPrivateFont(void* pBuffer, size_t szBuffer) override; 100 void LoadPrivateFont(void* pBuffer, size_t szBuffer) override;
101 IFPF_Font* CreateFont(const CFX_ByteStringC& bsFamilyname, 101 IFPF_Font* CreateFont(const CFX_ByteStringC& bsFamilyname,
102 uint8_t uCharset, 102 uint8_t uCharset,
103 FX_DWORD dwStyle, 103 uint32_t dwStyle,
104 FX_DWORD dwMatch = 0) override; 104 uint32_t dwMatch = 0) override;
105 105
106 FX_BOOL InitFTLibrary(); 106 FX_BOOL InitFTLibrary();
107 FXFT_Face GetFontFace(IFX_FileRead* pFileRead, int32_t iFaceIndex = 0); 107 FXFT_Face GetFontFace(IFX_FileRead* pFileRead, int32_t iFaceIndex = 0);
108 FXFT_Face GetFontFace(const CFX_ByteStringC& bsFile, int32_t iFaceIndex = 0); 108 FXFT_Face GetFontFace(const CFX_ByteStringC& bsFile, int32_t iFaceIndex = 0);
109 FXFT_Face GetFontFace(const uint8_t* pBuffer, 109 FXFT_Face GetFontFace(const uint8_t* pBuffer,
110 size_t szBuffer, 110 size_t szBuffer,
111 int32_t iFaceIndex = 0); 111 int32_t iFaceIndex = 0);
112 112
113 protected: 113 protected:
114 void ScanPath(const CFX_ByteStringC& path); 114 void ScanPath(const CFX_ByteStringC& path);
115 void ScanFile(const CFX_ByteStringC& file); 115 void ScanFile(const CFX_ByteStringC& file);
116 void ReportFace(FXFT_Face face, CFPF_SkiaFontDescriptor* pFontDesc); 116 void ReportFace(FXFT_Face face, CFPF_SkiaFontDescriptor* pFontDesc);
117 void OutputSystemFonts(); 117 void OutputSystemFonts();
118 118
119 FX_BOOL m_bLoaded; 119 FX_BOOL m_bLoaded;
120 FXFT_Library m_FTLibrary; 120 FXFT_Library m_FTLibrary;
121 std::vector<CFPF_SkiaFontDescriptor*> m_FontFaces; 121 std::vector<CFPF_SkiaFontDescriptor*> m_FontFaces;
122 std::map<FX_DWORD, CFPF_SkiaFont*> m_FamilyFonts; 122 std::map<uint32_t, CFPF_SkiaFont*> m_FamilyFonts;
123 }; 123 };
124 124
125 #endif 125 #endif
126 126
127 #endif // CORE_FXGE_ANDROID_FPF_SKIAFONTMGR_H_ 127 #endif // CORE_FXGE_ANDROID_FPF_SKIAFONTMGR_H_
OLDNEW
« no previous file with comments | « core/fxge/android/fpf_skiafont.cpp ('k') | core/fxge/android/fpf_skiafontmgr.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698