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

Side by Side Diff: core/src/fxge/ge/text_int.h

Issue 1252613002: FX_BOOL considered harmful. (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master
Patch Set: Manual edits. Created 5 years, 5 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/src/fxge/ge/fx_ge_text.cpp ('k') | core/src/fxge/skia/fx_skia_blitter_new.h » ('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_SRC_FXGE_GE_TEXT_INT_H_ 7 #ifndef CORE_SRC_FXGE_GE_TEXT_INT_H_
8 #define CORE_SRC_FXGE_GE_TEXT_INT_H_ 8 #define CORE_SRC_FXGE_GE_TEXT_INT_H_
9 9
10 struct _CFX_UniqueKeyGen { 10 struct _CFX_UniqueKeyGen {
(...skipping 14 matching lines...) Expand all
25 class CTTFontDesc 25 class CTTFontDesc
26 { 26 {
27 public: 27 public:
28 CTTFontDesc() 28 CTTFontDesc()
29 { 29 {
30 m_Type = 0; 30 m_Type = 0;
31 m_pFontData = NULL; 31 m_pFontData = NULL;
32 m_RefCount = 0; 32 m_RefCount = 0;
33 } 33 }
34 ~CTTFontDesc(); 34 ~CTTFontDesc();
35 FX_BOOL» » » ReleaseFace(FXFT_Face face); 35 bool» » » ReleaseFace(FXFT_Face face);
36 int m_Type; 36 int m_Type;
37 union { 37 union {
38 struct { 38 struct {
39 FX_BOOL» » m_bItalic; 39 bool» » m_bItalic;
40 FX_BOOL» » m_bBold; 40 bool» » m_bBold;
41 FXFT_Face m_pFace; 41 FXFT_Face m_pFace;
42 } m_SingleFace; 42 } m_SingleFace;
43 struct { 43 struct {
44 FXFT_Face m_pFaces[16]; 44 FXFT_Face m_pFaces[16];
45 } m_TTCFace; 45 } m_TTCFace;
46 }; 46 };
47 uint8_t* m_pFontData; 47 uint8_t* m_pFontData;
48 int m_RefCount; 48 int m_RefCount;
49 }; 49 };
50 class CFX_UnicodeEncoding : public IFX_FontEncoding 50 class CFX_UnicodeEncoding : public IFX_FontEncoding
51 { 51 {
52 public: 52 public:
53 CFX_UnicodeEncoding(CFX_Font* pFont); 53 CFX_UnicodeEncoding(CFX_Font* pFont);
54 virtual FX_DWORD GlyphFromCharCodeEx(FX_DWORD charcode, int encod ing = ENCODING_UNICODE); 54 virtual FX_DWORD GlyphFromCharCodeEx(FX_DWORD charcode, int encod ing = ENCODING_UNICODE);
55 private: 55 private:
56 CFX_Font* m_pFont; 56 CFX_Font* m_pFont;
57 virtual FX_DWORD GlyphFromCharCode(FX_DWORD charcode); 57 virtual FX_DWORD GlyphFromCharCode(FX_DWORD charcode);
58 virtual CFX_WideString UnicodeFromCharCode(FX_DWORD charcode) const 58 virtual CFX_WideString UnicodeFromCharCode(FX_DWORD charcode) const
59 { 59 {
60 return CFX_WideString((FX_WCHAR)charcode); 60 return CFX_WideString((FX_WCHAR)charcode);
61 } 61 }
62 virtual FX_DWORD CharCodeFromUnicode(FX_WCHAR Unicode) const 62 virtual FX_DWORD CharCodeFromUnicode(FX_WCHAR Unicode) const
63 { 63 {
64 return Unicode; 64 return Unicode;
65 } 65 }
66 virtual FX_BOOL» » » IsUnicodeCompatible() const 66 virtual bool» » » IsUnicodeCompatible() const
67 { 67 {
68 return TRUE; 68 return true;
69 } 69 }
70 }; 70 };
71 #define CHARSET_FLAG_ANSI 1 71 #define CHARSET_FLAG_ANSI 1
72 #define CHARSET_FLAG_SYMBOL 2 72 #define CHARSET_FLAG_SYMBOL 2
73 #define CHARSET_FLAG_SHIFTJIS 4 73 #define CHARSET_FLAG_SHIFTJIS 4
74 #define CHARSET_FLAG_BIG5 8 74 #define CHARSET_FLAG_BIG5 8
75 #define CHARSET_FLAG_GB 16 75 #define CHARSET_FLAG_GB 16
76 #define CHARSET_FLAG_KOREAN 32 76 #define CHARSET_FLAG_KOREAN 32
77 class CFontFaceInfo 77 class CFontFaceInfo
78 { 78 {
(...skipping 11 matching lines...) Expand all
90 public: 90 public:
91 CFontFileFaceInfo(); 91 CFontFileFaceInfo();
92 ~CFontFileFaceInfo(); 92 ~CFontFileFaceInfo();
93 IFX_FileStream* m_pFile; 93 IFX_FileStream* m_pFile;
94 FXFT_Face m_Face; 94 FXFT_Face m_Face;
95 CFX_ByteString m_FaceName; 95 CFX_ByteString m_FaceName;
96 FX_DWORD m_Charsets; 96 FX_DWORD m_Charsets;
97 FX_DWORD m_FileSize; 97 FX_DWORD m_FileSize;
98 FX_DWORD m_FontOffset; 98 FX_DWORD m_FontOffset;
99 int m_Weight; 99 int m_Weight;
100 FX_BOOL» » » » m_bItalic; 100 bool» » » » m_bItalic;
101 int m_PitchFamily; 101 int m_PitchFamily;
102 CFX_ByteString m_FontTables; 102 CFX_ByteString m_FontTables;
103 }; 103 };
104 104
105 #endif // CORE_SRC_FXGE_GE_TEXT_INT_H_ 105 #endif // CORE_SRC_FXGE_GE_TEXT_INT_H_
OLDNEW
« no previous file with comments | « core/src/fxge/ge/fx_ge_text.cpp ('k') | core/src/fxge/skia/fx_skia_blitter_new.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698