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

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

Issue 2559903002: Replace CFX_ByteStringArray with std::vector. (Closed)
Patch Set: Created 4 years 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/fxcrt/fx_basic.h ('k') | 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 167 matching lines...) Expand 10 before | Expand all | Expand 10 after
178 CFX_FontSourceEnum_File(); 178 CFX_FontSourceEnum_File();
179 ~CFX_FontSourceEnum_File(); 179 ~CFX_FontSourceEnum_File();
180 180
181 FX_POSITION GetStartPosition(); 181 FX_POSITION GetStartPosition();
182 IFX_FileAccess* GetNext(FX_POSITION& pos); 182 IFX_FileAccess* GetNext(FX_POSITION& pos);
183 183
184 private: 184 private:
185 CFX_ByteString GetNextFile(); 185 CFX_ByteString GetNextFile();
186 186
187 CFX_WideString m_wsNext; 187 CFX_WideString m_wsNext;
188 CFX_ObjectArray<FX_HandleParentPath> m_FolderQueue; 188 std::vector<FX_HandleParentPath> m_FolderQueue;
189 CFX_ByteStringArray m_FolderPaths; 189 std::vector<CFX_ByteString> m_FolderPaths;
190 }; 190 };
191 191
192 class CFGAS_FontMgr { 192 class CFGAS_FontMgr {
193 public: 193 public:
194 explicit CFGAS_FontMgr(CFX_FontSourceEnum_File* pFontEnum); 194 explicit CFGAS_FontMgr(CFX_FontSourceEnum_File* pFontEnum);
195 ~CFGAS_FontMgr(); 195 ~CFGAS_FontMgr();
196 static std::unique_ptr<CFGAS_FontMgr> Create( 196 static std::unique_ptr<CFGAS_FontMgr> Create(
197 CFX_FontSourceEnum_File* pFontEnum); 197 CFX_FontSourceEnum_File* pFontEnum);
198 198
199 CFGAS_GEFont* GetFontByCodePage(uint16_t wCodePage, 199 CFGAS_GEFont* GetFontByCodePage(uint16_t wCodePage,
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
250 CFX_MapPtrTemplate<uint32_t, CFX_FontDescriptorInfos*> m_Hash2CandidateList; 250 CFX_MapPtrTemplate<uint32_t, CFX_FontDescriptorInfos*> m_Hash2CandidateList;
251 CFX_MapPtrTemplate<uint32_t, CFX_ArrayTemplate<CFGAS_GEFont*>*> m_Hash2Fonts; 251 CFX_MapPtrTemplate<uint32_t, CFX_ArrayTemplate<CFGAS_GEFont*>*> m_Hash2Fonts;
252 std::map<CFGAS_GEFont*, CFX_RetainPtr<IFX_SeekableReadStream> > 252 std::map<CFGAS_GEFont*, CFX_RetainPtr<IFX_SeekableReadStream> >
253 m_IFXFont2FileRead; 253 m_IFXFont2FileRead;
254 CFX_MapPtrTemplate<FX_WCHAR, CFGAS_GEFont*> m_FailedUnicodes2Nullptr; 254 CFX_MapPtrTemplate<FX_WCHAR, CFGAS_GEFont*> m_FailedUnicodes2Nullptr;
255 CFX_FontSourceEnum_File* const m_pFontSource; 255 CFX_FontSourceEnum_File* const m_pFontSource;
256 }; 256 };
257 #endif 257 #endif
258 258
259 #endif // XFA_FGAS_FONT_CFGAS_FONTMGR_H_ 259 #endif // XFA_FGAS_FONT_CFGAS_FONTMGR_H_
OLDNEW
« no previous file with comments | « core/fxcrt/fx_basic.h ('k') | xfa/fgas/font/cfgas_fontmgr.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698