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

Side by Side Diff: core/fxge/include/fx_font.h

Issue 1885613003: Fix Windows GN build warning. (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master
Patch Set: Created 4 years, 8 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_fontmap.cpp ('k') | no next file » | 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_INCLUDE_FX_FONT_H_ 7 #ifndef CORE_FXGE_INCLUDE_FX_FONT_H_
8 #define CORE_FXGE_INCLUDE_FX_FONT_H_ 8 #define CORE_FXGE_INCLUDE_FX_FONT_H_
9 9
10 #include <map> 10 #include <map>
(...skipping 314 matching lines...) Expand 10 before | Expand all | Expand 10 after
325 CFX_ByteString GetPSNameFromTT(void* hFont); 325 CFX_ByteString GetPSNameFromTT(void* hFont);
326 CFX_ByteString MatchInstalledFonts(const CFX_ByteString& norm_name); 326 CFX_ByteString MatchInstalledFonts(const CFX_ByteString& norm_name);
327 FXFT_Face UseInternalSubst(CFX_SubstFont* pSubstFont, 327 FXFT_Face UseInternalSubst(CFX_SubstFont* pSubstFont,
328 int iBaseFont, 328 int iBaseFont,
329 int italic_angle, 329 int italic_angle,
330 int weight, 330 int weight,
331 int picthfamily); 331 int picthfamily);
332 332
333 struct FaceData { 333 struct FaceData {
334 CFX_ByteString name; 334 CFX_ByteString name;
335 uint32_t charset; 335 int charset;
336 }; 336 };
337 337
338 FX_BOOL m_bListLoaded; 338 FX_BOOL m_bListLoaded;
339 FXFT_Face m_MMFaces[MM_FACE_COUNT]; 339 FXFT_Face m_MMFaces[MM_FACE_COUNT];
340 CFX_ByteString m_LastFamily; 340 CFX_ByteString m_LastFamily;
341 std::vector<FaceData> m_FaceArray; 341 std::vector<FaceData> m_FaceArray;
342 IFX_SystemFontInfo* m_pFontInfo; 342 IFX_SystemFontInfo* m_pFontInfo;
343 FXFT_Face m_FoxitFaces[FOXIT_FACE_COUNT]; 343 FXFT_Face m_FoxitFaces[FOXIT_FACE_COUNT];
344 CFX_FontMgr* const m_pFontMgr; 344 CFX_FontMgr* const m_pFontMgr;
345 }; 345 };
(...skipping 195 matching lines...) Expand 10 before | Expand all | Expand 10 after
541 virtual ~IFX_GSUBTable() {} 541 virtual ~IFX_GSUBTable() {}
542 }; 542 };
543 543
544 CFX_ByteString GetNameFromTT(const uint8_t* name_table, 544 CFX_ByteString GetNameFromTT(const uint8_t* name_table,
545 uint32_t name_table_size, 545 uint32_t name_table_size,
546 uint32_t name); 546 uint32_t name);
547 547
548 int PDF_GetStandardFontName(CFX_ByteString* name); 548 int PDF_GetStandardFontName(CFX_ByteString* name);
549 549
550 #endif // CORE_FXGE_INCLUDE_FX_FONT_H_ 550 #endif // CORE_FXGE_INCLUDE_FX_FONT_H_
OLDNEW
« no previous file with comments | « core/fxge/ge/fx_ge_fontmap.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698