diff options
| author | Tom Sepez <tsepez@chromium.org> | 2017-04-04 14:37:18 -0700 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-04-04 21:48:48 +0000 |
| commit | afd0d1f488ea55da545b3310fd8f22e45522a695 (patch) | |
| tree | 89136eba4669421b6f828edb9f3d69ee558110d0 /core/fpdfapi/page/cpdf_docpagedata.h | |
| parent | 4f8b044b95dc282959dfe41453e2a9c1ec7e9354 (diff) | |
| download | pdfium-afd0d1f488ea55da545b3310fd8f22e45522a695.tar.xz | |
RefCount CPDF_StreamAcc all the time.
Pass stream argument to constructor; it feels like a
stream accessor should always be made from a stream rather
than passing one in after the fact.
Change-Id: Iaa46cb37677b81f0170f5d39bab76ad38ea4af44
Reviewed-on: https://pdfium-review.googlesource.com/3620
Commit-Queue: Tom Sepez <tsepez@chromium.org>
Reviewed-by: Lei Zhang <thestig@chromium.org>
Diffstat (limited to 'core/fpdfapi/page/cpdf_docpagedata.h')
| -rw-r--r-- | core/fpdfapi/page/cpdf_docpagedata.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/core/fpdfapi/page/cpdf_docpagedata.h b/core/fpdfapi/page/cpdf_docpagedata.h index 24e0006efd..f5ac303290 100644 --- a/core/fpdfapi/page/cpdf_docpagedata.h +++ b/core/fpdfapi/page/cpdf_docpagedata.h @@ -53,15 +53,14 @@ class CPDF_DocPageData { CFX_RetainPtr<CPDF_IccProfile> GetIccProfile(CPDF_Stream* pProfileStream); void MaybePurgeIccProfile(CPDF_Stream* pProfileStream); - CPDF_StreamAcc* GetFontFileStreamAcc(CPDF_Stream* pFontStream); - void ReleaseFontFileStreamAcc(const CPDF_Stream* pFontStream); + CFX_RetainPtr<CPDF_StreamAcc> GetFontFileStreamAcc(CPDF_Stream* pFontStream); + void MaybePurgeFontFileStreamAcc(const CPDF_Stream* pFontStream); CPDF_CountedColorSpace* FindColorSpacePtr(CPDF_Object* pCSObj) const; CPDF_CountedPattern* FindPatternPtr(CPDF_Object* pPatternObj) const; private: using CPDF_CountedFont = CPDF_CountedObject<CPDF_Font>; - using CPDF_CountedStreamAcc = CPDF_CountedObject<CPDF_StreamAcc>; CPDF_ColorSpace* GetColorSpaceImpl(CPDF_Object* pCSObj, const CPDF_Dictionary* pResources, @@ -71,7 +70,7 @@ class CPDF_DocPageData { bool m_bForceClear; std::map<CFX_ByteString, CPDF_Stream*> m_HashProfileMap; std::map<const CPDF_Object*, CPDF_CountedColorSpace*> m_ColorSpaceMap; - std::map<const CPDF_Stream*, CPDF_CountedStreamAcc*> m_FontFileMap; + std::map<const CPDF_Stream*, CFX_RetainPtr<CPDF_StreamAcc>> m_FontFileMap; std::map<const CPDF_Dictionary*, CPDF_CountedFont*> m_FontMap; std::map<const CPDF_Stream*, CFX_RetainPtr<CPDF_IccProfile>> m_IccProfileMap; std::map<uint32_t, CFX_RetainPtr<CPDF_Image>> m_ImageMap; |