diff options
| author | Tom Sepez <tsepez@chromium.org> | 2017-05-23 14:31:00 -0700 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-05-23 21:48:51 +0000 |
| commit | 258909cda89cb478ed44d56ca3e88d86f9dd4733 (patch) | |
| tree | 59bde9f676b2faca74a64f130099663e14fd4b90 /core/fpdfapi/render/cpdf_pagerendercache.h | |
| parent | abc83aa862050642a90ed109074a9cf1018fee9b (diff) | |
| download | pdfium-258909cda89cb478ed44d56ca3e88d86f9dd4733.tar.xz | |
Make CPDF_ImageCacheEntry retain CPDF_Image
CPDF_PageRenderCache::m_ImageCache is a map from streams to
an image cache entry containing a clump of data associated
with the stream. Oddly, the clump includes the stream key (which
we already have in order to get to the clump), but worse doesn't
ensure the existence of the CPDF_Image object which (maybe) owns
the stream key in question.
So replace the stream with a retained ptr to the image.
Also renamed an unrelated member to avoid confusion with the
CPDF_Object in play.
Bug: 724460
Change-Id: Id13d2c246918d4ff78c12b5bdb927f99c3f5e4e1
Reviewed-on: https://pdfium-review.googlesource.com/5771
Commit-Queue: Tom Sepez <tsepez@chromium.org>
Reviewed-by: Lei Zhang <thestig@chromium.org>
Diffstat (limited to 'core/fpdfapi/render/cpdf_pagerendercache.h')
| -rw-r--r-- | core/fpdfapi/render/cpdf_pagerendercache.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/core/fpdfapi/render/cpdf_pagerendercache.h b/core/fpdfapi/render/cpdf_pagerendercache.h index 5d9ae03a1c..626e24bd2e 100644 --- a/core/fpdfapi/render/cpdf_pagerendercache.h +++ b/core/fpdfapi/render/cpdf_pagerendercache.h @@ -12,11 +12,12 @@ #include "core/fxcrt/cfx_retain_ptr.h" #include "core/fxcrt/fx_system.h" -class CPDF_Stream; +class CFX_DIBitmap; +class CPDF_Image; class CPDF_ImageCacheEntry; class CPDF_Page; class CPDF_RenderStatus; -class CFX_DIBitmap; +class CPDF_Stream; class IFX_Pause; class CPDF_PageRenderCache { @@ -26,15 +27,14 @@ class CPDF_PageRenderCache { void CacheOptimization(int32_t dwLimitCacheSize); uint32_t GetTimeCount() const { return m_nTimeCount; } - - void ResetBitmap(CPDF_Stream* pStream, + void ResetBitmap(const CFX_RetainPtr<CPDF_Image>& pImage, const CFX_RetainPtr<CFX_DIBitmap>& pBitmap); CPDF_Page* GetPage() const { return m_pPage; } CPDF_ImageCacheEntry* GetCurImageCacheEntry() const { return m_pCurImageCacheEntry; } - bool StartGetCachedBitmap(CPDF_Stream* pStream, + bool StartGetCachedBitmap(const CFX_RetainPtr<CPDF_Image>& pImage, bool bStdCS, uint32_t GroupFamily, bool bLoadMask, |