xfa/fgas/font/cfgas_gefont.h - Issue 2616623005: Remove CFX_MapPtrToPtr in xfa/fgas, part 2

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 2616623005: Remove CFX_MapPtrToPtr in xfa/fgas, part 2 (Closed)

Patch Set: unique_ptr 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 | « xfa/fgas/font/cfgas_fontmgr.cpp ('k') | xfa/fgas/font/cfgas_gefont.cpp » ('j') | xfa/fgas/font/cfgas_gefont.cpp » ('J')

OLD	NEW
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_GEFONT_H_	7 #ifndef XFA_FGAS_FONT_CFGAS_GEFONT_H_

8 #define XFA_FGAS_FONT_CFGAS_GEFONT_H_	8 #define XFA_FGAS_FONT_CFGAS_GEFONT_H_

9	9

10 #include <map>	10 #include <map>

(...skipping 91 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
102 #endif	102 #endif

103 CFX_Font* m_pFont;	103 CFX_Font* m_pFont;

104 CFX_RetainPtr<CFGAS_GEFont> m_pSrcFont; // Only set by ctor, so no cycles.	104 CFX_RetainPtr<CFGAS_GEFont> m_pSrcFont; // Only set by ctor, so no cycles.

105 CFGAS_FontMgr* const m_pFontMgr;	105 CFGAS_FontMgr* const m_pFontMgr;

106 bool m_bExternalFont;	106 bool m_bExternalFont;

107 CFX_RetainPtr<IFGAS_Stream> m_pStream;	107 CFX_RetainPtr<IFGAS_Stream> m_pStream;

108 CFX_RetainPtr<IFX_SeekableReadStream> m_pFileRead;	108 CFX_RetainPtr<IFX_SeekableReadStream> m_pFileRead;

109 std::unique_ptr<CFX_UnicodeEncoding> m_pFontEncoding;	109 std::unique_ptr<CFX_UnicodeEncoding> m_pFontEncoding;

110 std::unique_ptr<CFX_DiscreteArrayTemplate<uint16_t>> m_pCharWidthMap;	110 std::unique_ptr<CFX_DiscreteArrayTemplate<uint16_t>> m_pCharWidthMap;

111 std::unique_ptr<CFX_MassArrayTemplate<CFX_Rect>> m_pRectArray;	111 std::unique_ptr<CFX_MassArrayTemplate<CFX_Rect>> m_pRectArray;

112 std::unique_ptr<CFX_MapPtrToPtr> m_pBBoxMap;	112 std::map<FX_WCHAR, CFX_Rect*> m_BBoxMap;
	dsinclair 2017/01/06 02:40:29 Add comment that the Rect* is owned by m_pRectArra Add comment that the Rect* is owned by m_pRectArray to make ownership clear. Tom Sepez 2017/01/06 17:27:03 Done. Show quoted text On 2017/01/06 02:40:29, dsinclair wrote: > Add comment that the Rect* is owned by m_pRectArray to make ownership clear. Done.
113 CXFA_PDFFontMgr* m_pProvider; // not owned.	113 CXFA_PDFFontMgr* m_pProvider; // not owned.

114 std::vector<CFX_RetainPtr<CFGAS_GEFont>> m_SubstFonts;	114 std::vector<CFX_RetainPtr<CFGAS_GEFont>> m_SubstFonts;

115 std::map<FX_WCHAR, CFX_RetainPtr<CFGAS_GEFont>> m_FontMapper;	115 std::map<FX_WCHAR, CFX_RetainPtr<CFGAS_GEFont>> m_FontMapper;

116 };	116 };

117	117

118 #endif // XFA_FGAS_FONT_CFGAS_GEFONT_H_	118 #endif // XFA_FGAS_FONT_CFGAS_GEFONT_H_

OLD	NEW