1 files changed, 8 insertions, 6 deletions
diff --git a/core/fpdfapi/render/cpdf_pagerendercache.h b/core/fpdfapi/render/cpdf_pagerendercache.h
index 8f0cb59414..5cfdebb812 100644
--- a/core/fpdfapi/render/cpdf_pagerendercache.h
+++ b/core/fpdfapi/render/cpdf_pagerendercache.h
@@ -8,8 +8,10 @@
 #define CORE_FPDFAPI_RENDER_CPDF_PAGERENDERCACHE_H_
 
 #include <map>
+#include <memory>
 
 #include "core/fxcrt/fx_system.h"
+#include "core/fxcrt/maybe_owned.h"
 #include "core/fxcrt/retain_ptr.h"
 #include "core/fxcrt/unowned_ptr.h"
 
@@ -30,7 +32,7 @@ class CPDF_PageRenderCache {
   void ResetBitmap(const RetainPtr<CPDF_Image>& pImage);
   CPDF_Page* GetPage() const { return m_pPage.Get(); }
   CPDF_ImageCacheEntry* GetCurImageCacheEntry() const {
-    return m_pCurImageCacheEntry;
+    return m_pCurImageCacheEntry.Get();
   }
 
   bool StartGetCachedBitmap(const RetainPtr<CPDF_Image>& pImage,
@@ -45,11 +47,11 @@ class CPDF_PageRenderCache {
   void ClearImageCacheEntry(CPDF_Stream* pStream);
 
   UnownedPtr<CPDF_Page> const m_pPage;
-  CPDF_ImageCacheEntry* m_pCurImageCacheEntry;
-  std::map<CPDF_Stream*, CPDF_ImageCacheEntry*> m_ImageCache;
-  uint32_t m_nTimeCount;
-  uint32_t m_nCacheSize;
-  bool m_bCurFindCache;
+  std::map<CPDF_Stream*, std::unique_ptr<CPDF_ImageCacheEntry>> m_ImageCache;
+  MaybeOwned<CPDF_ImageCacheEntry> m_pCurImageCacheEntry;
+  uint32_t m_nTimeCount = 0;
+  uint32_t m_nCacheSize = 0;
+  bool m_bCurFindCache = false;
 };
 
 #endif  // CORE_FPDFAPI_RENDER_CPDF_PAGERENDERCACHE_H_