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

Side by Side Diff: xfa/fgas/font/cfgas_fontmgr.h

Issue 2616623005: Remove CFX_MapPtrToPtr in xfa/fgas, part 2 (Closed)
Patch Set: typo Created 3 years, 11 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 | xfa/fgas/font/cfgas_fontmgr.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 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 XFA_FGAS_FONT_CFGAS_FONTMGR_H_ 7 #ifndef XFA_FGAS_FONT_CFGAS_FONTMGR_H_
8 #define XFA_FGAS_FONT_CFGAS_FONTMGR_H_ 8 #define XFA_FGAS_FONT_CFGAS_FONTMGR_H_
9 9
10 #include <map> 10 #include <map>
(...skipping 231 matching lines...) Expand 10 before | Expand all | Expand 10 after
242 FXFT_Face LoadFace(const CFX_RetainPtr<IFX_SeekableReadStream>& pFontStream, 242 FXFT_Face LoadFace(const CFX_RetainPtr<IFX_SeekableReadStream>& pFontStream,
243 int32_t iFaceIndex); 243 int32_t iFaceIndex);
244 CFX_RetainPtr<IFX_SeekableReadStream> CreateFontStream( 244 CFX_RetainPtr<IFX_SeekableReadStream> CreateFontStream(
245 CFX_FontMapper* pFontMapper, 245 CFX_FontMapper* pFontMapper,
246 IFX_SystemFontInfo* pSystemFontInfo, 246 IFX_SystemFontInfo* pSystemFontInfo,
247 uint32_t index); 247 uint32_t index);
248 CFX_RetainPtr<IFX_SeekableReadStream> CreateFontStream( 248 CFX_RetainPtr<IFX_SeekableReadStream> CreateFontStream(
249 const CFX_ByteString& bsFaceName); 249 const CFX_ByteString& bsFaceName);
250 250
251 CFX_FontDescriptors m_InstalledFonts; 251 CFX_FontDescriptors m_InstalledFonts;
252 CFX_MapPtrTemplate<uint32_t, CFX_FontDescriptorInfos*> m_Hash2CandidateList; 252 std::map<uint32_t, std::unique_ptr<CFX_FontDescriptorInfos>>
253 m_Hash2CandidateList;
253 std::map<uint32_t, std::vector<CFX_RetainPtr<CFGAS_GEFont>>> m_Hash2Fonts; 254 std::map<uint32_t, std::vector<CFX_RetainPtr<CFGAS_GEFont>>> m_Hash2Fonts;
254 std::map<CFX_RetainPtr<CFGAS_GEFont>, CFX_RetainPtr<IFX_SeekableReadStream>> 255 std::map<CFX_RetainPtr<CFGAS_GEFont>, CFX_RetainPtr<IFX_SeekableReadStream>>
255 m_IFXFont2FileRead; 256 m_IFXFont2FileRead;
256 std::set<FX_WCHAR> m_FailedUnicodesSet; 257 std::set<FX_WCHAR> m_FailedUnicodesSet;
257 CFX_FontSourceEnum_File* const m_pFontSource; 258 CFX_FontSourceEnum_File* const m_pFontSource;
258 }; 259 };
259 #endif // _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_ 260 #endif // _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
260 261
261 #endif // XFA_FGAS_FONT_CFGAS_FONTMGR_H_ 262 #endif // XFA_FGAS_FONT_CFGAS_FONTMGR_H_
OLDNEW
« no previous file with comments | « no previous file | xfa/fgas/font/cfgas_fontmgr.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698