diff options
| author | tsepez <tsepez@chromium.org> | 2017-01-06 09:48:18 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2017-01-06 09:48:18 -0800 |
| commit | 6fd07ef0a817dca5acbcadea41b8f880376f339a (patch) | |
| tree | e330419f0289e503478bffc7638e836e113a7fe7 /xfa/fgas/font/cfgas_gefont.h | |
| parent | 8d94b6687f27e1238f352939434704f75b330c1d (diff) | |
| download | pdfium-6fd07ef0a817dca5acbcadea41b8f880376f339a.tar.xz | |
Remove CFX_MapPtrToPtr in xfa/fgas, part 2
Review-Url: https://codereview.chromium.org/2616623005
Diffstat (limited to 'xfa/fgas/font/cfgas_gefont.h')
| -rw-r--r-- | xfa/fgas/font/cfgas_gefont.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/xfa/fgas/font/cfgas_gefont.h b/xfa/fgas/font/cfgas_gefont.h index 962b93fbb5..de4f9639e0 100644 --- a/xfa/fgas/font/cfgas_gefont.h +++ b/xfa/fgas/font/cfgas_gefont.h @@ -55,8 +55,8 @@ class CFGAS_GEFont : public CFX_Retainable { int32_t GetGlyphIndex(FX_WCHAR wUnicode, bool bCharCode = false); int32_t GetAscent() const; int32_t GetDescent() const; - bool GetCharBBox(FX_WCHAR wUnicode, CFX_Rect& bbox, bool bCharCode = false); - bool GetBBox(CFX_Rect& bbox); + bool GetCharBBox(FX_WCHAR wUnicode, CFX_Rect* bbox, bool bCharCode = false); + bool GetBBox(CFX_Rect* bbox); CFX_RetainPtr<CFGAS_GEFont> GetSubstFont(int32_t iGlyphIndex) const; CFX_Font* GetDevFont() const { return m_pFont; } void SetFontProvider(CXFA_PDFFontMgr* pProvider) { m_pProvider = pProvider; } @@ -83,7 +83,7 @@ class CFGAS_GEFont : public CFX_Retainable { bool LoadFontInternal(std::unique_ptr<CFX_Font> pInternalFont); bool InitFont(); bool GetCharBBoxInternal(FX_WCHAR wUnicode, - CFX_Rect& bbox, + CFX_Rect* bbox, bool bRecursive, bool bCharCode = false); bool GetCharWidthInternal(FX_WCHAR wUnicode, @@ -109,7 +109,7 @@ class CFGAS_GEFont : public CFX_Retainable { std::unique_ptr<CFX_UnicodeEncoding> m_pFontEncoding; std::unique_ptr<CFX_DiscreteArrayTemplate<uint16_t>> m_pCharWidthMap; std::unique_ptr<CFX_MassArrayTemplate<CFX_Rect>> m_pRectArray; - std::unique_ptr<CFX_MapPtrToPtr> m_pBBoxMap; + std::map<FX_WCHAR, CFX_Rect*> m_BBoxMap; // Rect owned by m_pRectArray. CXFA_PDFFontMgr* m_pProvider; // not owned. std::vector<CFX_RetainPtr<CFGAS_GEFont>> m_SubstFonts; std::map<FX_WCHAR, CFX_RetainPtr<CFGAS_GEFont>> m_FontMapper; |