Remove CFX_MapPtrToPtr in CFX_PageRenderCache

core/src/fpdfapi/fpdf_render/render_int.h

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #ifndef CORE_SRC_FPDFAPI_FPDF_RENDER_RENDER_INT_H_
 #define CORE_SRC_FPDFAPI_FPDF_RENDER_RENDER_INT_H_
 
 #include <map>
 
 #include "core/include/fpdfapi/fpdf_pageobj.h"
 #include "core/include/fpdfapi/fpdf_render.h"
 #include "third_party/base/nonstd_unique_ptr.h"
 
 class CFX_GlyphBitmap;
-class CPDF_ImageCache;
+class CPDF_ImageCacheEntry;
 class ICodec_ScanlineDecoder;
 
 #define TYPE3_MAX_BLUES 16
 
 class CPDF_Type3Glyphs {
  public:
   CPDF_Type3Glyphs() : m_TopBlueCount(0), m_BottomBlueCount(0) {}
   ~CPDF_Type3Glyphs();
   void AdjustBlue(FX_FLOAT top,
                   FX_FLOAT bottom,
@@ skipping 151 matching lines @@
   FX_BOOL ProcessImage(CPDF_ImageObject* pImageObj,
                        const CFX_Matrix* pObj2Device);
   FX_BOOL OutputBitmapAlpha(CPDF_ImageObject* pImageObj,
                             const CFX_Matrix* pImage2Device);
   FX_BOOL OutputImage(CPDF_ImageObject* pImageObj,
                       const CFX_Matrix* pImage2Device);
   FX_BOOL OutputDIBSource(const CFX_DIBSource* pOutputBitmap,
                           FX_ARGB fill_argb,
                           int bitmap_alpha,
                           const CFX_Matrix* pImage2Device,
-                          CPDF_ImageCache* pImageCache,
+                          CPDF_ImageCacheEntry* pImageCache,
                           FX_DWORD flags);
   void CompositeDIBitmap(CFX_DIBitmap* pDIBitmap,
                          int left,
                          int top,
                          FX_ARGB mask_argb,
                          int bitmap_alpha,
                          int blend_mode,
                          int bIsolated);
   FX_BOOL ProcessShading(CPDF_ShadingObject* pShadingObj,
                          const CFX_Matrix* pObj2Device);
@@ skipping 217 matching lines @@
 
  private:
   CFX_RenderDevice* m_pDevice;
   CPDF_RenderContext* m_pContext;
   FX_RECT m_Rect;
   const CPDF_PageObject* m_pObject;
   nonstd::unique_ptr<CFX_DIBitmap> m_pBitmap;
   CFX_Matrix m_Matrix;
 };
 
-class CPDF_ImageCache {
+class CPDF_ImageCacheEntry {
  public:
-  CPDF_ImageCache(CPDF_Document* pDoc, CPDF_Stream* pStream);
-  ~CPDF_ImageCache();
+  CPDF_ImageCacheEntry(CPDF_Document* pDoc, CPDF_Stream* pStream);
+  ~CPDF_ImageCacheEntry();
   void ClearImageData();
   void Reset(const CFX_DIBitmap* pBitmap);
   FX_BOOL GetCachedBitmap(CFX_DIBSource*& pBitmap,
                           CFX_DIBSource*& pMask,
                           FX_DWORD& MatteColor,
                           CPDF_Dictionary* pPageResources,
                           FX_BOOL bStdCS = FALSE,
                           FX_DWORD GroupFamily = 0,
                           FX_BOOL bLoadMask = FALSE,
                           CPDF_RenderStatus* pRenderStatus = NULL,
                           int32_t downsampleWidth = 0,
                           int32_t downsampleHeight = 0);
   FX_DWORD EstimateSize() const { return m_dwCacheSize; }
   FX_DWORD GetTimeCount() const { return m_dwTimeCount; }
   CPDF_Stream* GetStream() const { return m_pStream; }
   void SetTimeCount(FX_DWORD dwTimeCount) { m_dwTimeCount = dwTimeCount; }
   int m_dwTimeCount;
 
  public:
   int StartGetCachedBitmap(CPDF_Dictionary* pFormResources,
                            CPDF_Dictionary* pPageResources,
                            FX_BOOL bStdCS = FALSE,
                            FX_DWORD GroupFamily = 0,
                            FX_BOOL bLoadMask = FALSE,
                            CPDF_RenderStatus* pRenderStatus = NULL,
                            int32_t downsampleWidth = 0,
                            int32_t downsampleHeight = 0);
   int Continue(IFX_Pause* pPause);
-  int ContinueGetCachedBitmap();
   CFX_DIBSource* DetachBitmap();
   CFX_DIBSource* DetachMask();
   CFX_DIBSource* m_pCurBitmap;
   CFX_DIBSource* m_pCurMask;
   FX_DWORD m_MatteColor;
   CPDF_RenderStatus* m_pRenderStatus;
 
  protected:
+  void ContinueGetCachedBitmap();
+
   CPDF_Document* m_pDocument;
   CPDF_Stream* m_pStream;
   CFX_DIBSource* m_pCachedBitmap;
   CFX_DIBSource* m_pCachedMask;
   FX_DWORD m_dwCacheSize;
   void CalcSize();
 };
 typedef struct {
   FX_FLOAT m_DecodeMin;
   FX_FLOAT m_DecodeStep;
@@ skipping 141 matching lines @@
   const uint8_t* m_RampB;
 };
 
 struct _CPDF_UniqueKeyGen {
   void Generate(int count, ...);
   FX_CHAR m_Key[128];
   int m_KeyLen;
 };
 
 #endif  // CORE_SRC_FPDFAPI_FPDF_RENDER_RENDER_INT_H_