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

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

Issue 1426103002: XFA: Take CTTFontDesc::ReleaseFace() changes from master. (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@xfa
Patch Set: Created 5 years, 1 month 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
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 #include "../../../include/fxge/fx_freetype.h" 10 #include "../../../include/fxge/fx_freetype.h"
(...skipping 10 matching lines...) Expand all
21 CFX_MapPtrToPtr m_GlyphMap; 21 CFX_MapPtrToPtr m_GlyphMap;
22 }; 22 };
23 class CTTFontDesc { 23 class CTTFontDesc {
24 public: 24 public:
25 CTTFontDesc() { 25 CTTFontDesc() {
26 m_Type = 0; 26 m_Type = 0;
27 m_pFontData = NULL; 27 m_pFontData = NULL;
28 m_RefCount = 0; 28 m_RefCount = 0;
29 } 29 }
30 ~CTTFontDesc(); 30 ~CTTFontDesc();
31 int32_t ReleaseFace(FXFT_Face face); 31 FX_BOOL ReleaseFace(FXFT_Face face);
32 int m_Type; 32 int m_Type;
33 union { 33 union {
34 struct { 34 struct {
35 FX_BOOL m_bItalic; 35 FX_BOOL m_bItalic;
36 FX_BOOL m_bBold; 36 FX_BOOL m_bBold;
37 FXFT_Face m_pFace; 37 FXFT_Face m_pFace;
38 } m_SingleFace; 38 } m_SingleFace;
39 struct { 39 struct {
40 FXFT_Face m_pFaces[16]; 40 FXFT_Face m_pFaces[16];
41 } m_TTCFace; 41 } m_TTCFace;
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
86 FX_DWORD m_Charsets; 86 FX_DWORD m_Charsets;
87 FX_DWORD m_FileSize; 87 FX_DWORD m_FileSize;
88 FX_DWORD m_FontOffset; 88 FX_DWORD m_FontOffset;
89 int m_Weight; 89 int m_Weight;
90 FX_BOOL m_bItalic; 90 FX_BOOL m_bItalic;
91 int m_PitchFamily; 91 int m_PitchFamily;
92 CFX_ByteString m_FontTables; 92 CFX_ByteString m_FontTables;
93 }; 93 };
94 94
95 #endif // CORE_SRC_FXGE_GE_TEXT_INT_H_ 95 #endif // CORE_SRC_FXGE_GE_TEXT_INT_H_
OLDNEW
« core/src/fxge/ge/fx_ge_fontmap.cpp ('K') | « core/src/fxge/ge/fx_ge_fontmap.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698