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

Side by Side Diff: core/fxge/ge/fx_text_int.h

Issue 2032613003: Get rid of NULLs in core/ (Closed) Base URL: https://pdfium.googlesource.com/pdfium@master
Patch Set: Fix a bad merge Created 4 years, 6 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/ge/fx_ge_text.cpp ('k') | core/fxge/include/fx_dib.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_FXGE_GE_FX_TEXT_INT_H_ 7 #ifndef CORE_FXGE_GE_FX_TEXT_INT_H_
8 #define CORE_FXGE_GE_FX_TEXT_INT_H_ 8 #define CORE_FXGE_GE_FX_TEXT_INT_H_
9 9
10 #include <map> 10 #include <map>
11 11
12 #include "core/fxge/include/fx_font.h" 12 #include "core/fxge/include/fx_font.h"
13 #include "core/fxge/include/fx_freetype.h" 13 #include "core/fxge/include/fx_freetype.h"
14 14
15 struct _CFX_UniqueKeyGen { 15 struct _CFX_UniqueKeyGen {
16 void Generate(int count, ...); 16 void Generate(int count, ...);
17 FX_CHAR m_Key[128]; 17 FX_CHAR m_Key[128];
18 int m_KeyLen; 18 int m_KeyLen;
19 }; 19 };
20 class CFX_SizeGlyphCache { 20 class CFX_SizeGlyphCache {
21 public: 21 public:
22 CFX_SizeGlyphCache() {} 22 CFX_SizeGlyphCache() {}
23 ~CFX_SizeGlyphCache(); 23 ~CFX_SizeGlyphCache();
24 std::map<uint32_t, CFX_GlyphBitmap*> m_GlyphMap; 24 std::map<uint32_t, CFX_GlyphBitmap*> m_GlyphMap;
25 }; 25 };
26 class CTTFontDesc { 26 class CTTFontDesc {
27 public: 27 public:
28 CTTFontDesc() { 28 CTTFontDesc() {
29 m_Type = 0; 29 m_Type = 0;
30 m_pFontData = NULL; 30 m_pFontData = nullptr;
31 m_RefCount = 0; 31 m_RefCount = 0;
32 } 32 }
33 ~CTTFontDesc(); 33 ~CTTFontDesc();
34 // ret < 0, releaseface not appropriate for this object. 34 // ret < 0, releaseface not appropriate for this object.
35 // ret == 0, object released 35 // ret == 0, object released
36 // ret > 0, object still alive, other referrers. 36 // ret > 0, object still alive, other referrers.
37 int ReleaseFace(FXFT_Face face); 37 int ReleaseFace(FXFT_Face face);
38 int m_Type; 38 int m_Type;
39 union { 39 union {
40 struct { 40 struct {
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 const CFX_ByteString m_FilePath; 75 const CFX_ByteString m_FilePath;
76 const CFX_ByteString m_FaceName; 76 const CFX_ByteString m_FaceName;
77 const CFX_ByteString m_FontTables; 77 const CFX_ByteString m_FontTables;
78 const uint32_t m_FontOffset; 78 const uint32_t m_FontOffset;
79 const uint32_t m_FileSize; 79 const uint32_t m_FileSize;
80 uint32_t m_Styles; 80 uint32_t m_Styles;
81 uint32_t m_Charsets; 81 uint32_t m_Charsets;
82 }; 82 };
83 83
84 #endif // CORE_FXGE_GE_FX_TEXT_INT_H_ 84 #endif // CORE_FXGE_GE_FX_TEXT_INT_H_
OLDNEW
« no previous file with comments | « core/fxge/ge/fx_ge_text.cpp ('k') | core/fxge/include/fx_dib.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698