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

Side by Side Diff: core/fxge/cfx_fontmapper.h

Issue 2395883002: Use another vector for installed fonts in CFX_FontMapper (Closed)
Patch Set: Nits Created 4 years, 2 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 | « no previous file | core/fxge/ge/cfx_fontmapper.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 2016 PDFium Authors. All rights reserved. 1 // Copyright 2016 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_CFX_FONTMAPPER_H_ 7 #ifndef CORE_FXGE_CFX_FONTMAPPER_H_
8 #define CORE_FXGE_CFX_FONTMAPPER_H_ 8 #define CORE_FXGE_CFX_FONTMAPPER_H_
9 9
10 #include <memory> 10 #include <memory>
(...skipping 27 matching lines...) Expand all
38 int weight, 38 int weight,
39 int italic_angle); 39 int italic_angle);
40 #endif // PDF_ENABLE_XFA 40 #endif // PDF_ENABLE_XFA
41 FX_BOOL IsBuiltinFace(const FXFT_Face face) const; 41 FX_BOOL IsBuiltinFace(const FXFT_Face face) const;
42 int GetFaceSize() const; 42 int GetFaceSize() const;
43 CFX_ByteString GetFaceName(int index) const { 43 CFX_ByteString GetFaceName(int index) const {
44 return m_FaceArray[index].name; 44 return m_FaceArray[index].name;
45 } 45 }
46 46
47 std::vector<CFX_ByteString> m_InstalledTTFonts; 47 std::vector<CFX_ByteString> m_InstalledTTFonts;
48 std::vector<std::pair<CFX_ByteString, CFX_ByteString>> m_LocalizedTTFonts;
48 49
49 private: 50 private:
50 static const size_t MM_FACE_COUNT = 2; 51 static const size_t MM_FACE_COUNT = 2;
51 static const size_t FOXIT_FACE_COUNT = 14; 52 static const size_t FOXIT_FACE_COUNT = 14;
52 53
53 CFX_ByteString GetPSNameFromTT(void* hFont); 54 CFX_ByteString GetPSNameFromTT(void* hFont);
54 CFX_ByteString MatchInstalledFonts(const CFX_ByteString& norm_name); 55 CFX_ByteString MatchInstalledFonts(const CFX_ByteString& norm_name);
55 FXFT_Face UseInternalSubst(CFX_SubstFont* pSubstFont, 56 FXFT_Face UseInternalSubst(CFX_SubstFont* pSubstFont,
56 int iBaseFont, 57 int iBaseFont,
57 int italic_angle, 58 int italic_angle,
(...skipping 17 matching lines...) Expand all
75 FX_BOOL m_bListLoaded; 76 FX_BOOL m_bListLoaded;
76 FXFT_Face m_MMFaces[MM_FACE_COUNT]; 77 FXFT_Face m_MMFaces[MM_FACE_COUNT];
77 CFX_ByteString m_LastFamily; 78 CFX_ByteString m_LastFamily;
78 std::vector<FaceData> m_FaceArray; 79 std::vector<FaceData> m_FaceArray;
79 std::unique_ptr<IFX_SystemFontInfo> m_pFontInfo; 80 std::unique_ptr<IFX_SystemFontInfo> m_pFontInfo;
80 FXFT_Face m_FoxitFaces[FOXIT_FACE_COUNT]; 81 FXFT_Face m_FoxitFaces[FOXIT_FACE_COUNT];
81 CFX_FontMgr* const m_pFontMgr; 82 CFX_FontMgr* const m_pFontMgr;
82 }; 83 };
83 84
84 #endif // CORE_FXGE_CFX_FONTMAPPER_H_ 85 #endif // CORE_FXGE_CFX_FONTMAPPER_H_
OLDNEW
« no previous file with comments | « no previous file | core/fxge/ge/cfx_fontmapper.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698