Remove CFX_MapPtrToPtr in CFX_PageRenderCache

core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp

 // 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
 
 #include "render_int.h"
 
 #include <vector>
 
@@ skipping 1542 matching lines @@
   m_pImageLoader = pImageLoader;
   m_pCache = pCache;
   m_pImage = (CPDF_ImageObject*)pImage;
   m_nDownsampleWidth = nDownsampleWidth;
   m_nDownsampleHeight = nDownsampleHeight;
   FX_BOOL ret;
   if (pCache) {
     ret = pCache->StartGetCachedBitmap(pImage->m_pImage->GetStream(), bStdCS,
                                        GroupFamily, bLoadMask, pRenderStatus,
                                        m_nDownsampleWidth, m_nDownsampleHeight);
-    if (ret == FALSE) {
+    if (!ret) {
       m_pImageLoader->m_bCached = TRUE;
-      m_pImageLoader->m_pBitmap = pCache->m_pCurImageCache->DetachBitmap();
-      m_pImageLoader->m_pMask = pCache->m_pCurImageCache->DetachMask();
-      m_pImageLoader->m_MatteColor = pCache->m_pCurImageCache->m_MatteColor;
+      m_pImageLoader->m_pBitmap =
+          pCache->GetCurImageCacheEntry()->DetachBitmap();
+      m_pImageLoader->m_pMask = pCache->GetCurImageCacheEntry()->DetachMask();
+      m_pImageLoader->m_MatteColor =
+          pCache->GetCurImageCacheEntry()->m_MatteColor;
     }
   } else {
     ret = pImage->m_pImage->StartLoadDIBSource(pRenderStatus->m_pFormResource,
                                                pRenderStatus->m_pPageResource,
                                                bStdCS, GroupFamily, bLoadMask);
-    if (ret == FALSE) {
+    if (!ret) {
       m_pImageLoader->m_bCached = FALSE;
       m_pImageLoader->m_pBitmap = m_pImage->m_pImage->DetachBitmap();
       m_pImageLoader->m_pMask = m_pImage->m_pImage->DetachMask();
       m_pImageLoader->m_MatteColor = m_pImage->m_pImage->m_MatteColor;
     }
   }
   return ret;
 }
 FX_BOOL CPDF_ProgressiveImageLoaderHandle::Continue(IFX_Pause* pPause) {
   FX_BOOL ret;
   if (m_pCache) {
     ret = m_pCache->Continue(pPause);
-    if (ret == FALSE) {
+    if (!ret) {
       m_pImageLoader->m_bCached = TRUE;
-      m_pImageLoader->m_pBitmap = m_pCache->m_pCurImageCache->DetachBitmap();
-      m_pImageLoader->m_pMask = m_pCache->m_pCurImageCache->DetachMask();
-      m_pImageLoader->m_MatteColor = m_pCache->m_pCurImageCache->m_MatteColor;
+      m_pImageLoader->m_pBitmap =
+          m_pCache->GetCurImageCacheEntry()->DetachBitmap();
+      m_pImageLoader->m_pMask = m_pCache->GetCurImageCacheEntry()->DetachMask();
+      m_pImageLoader->m_MatteColor =
+          m_pCache->GetCurImageCacheEntry()->m_MatteColor;
     }
   } else {
     ret = m_pImage->m_pImage->Continue(pPause);
-    if (ret == FALSE) {
+    if (!ret) {
       m_pImageLoader->m_bCached = FALSE;
       m_pImageLoader->m_pBitmap = m_pImage->m_pImage->DetachBitmap();
       m_pImageLoader->m_pMask = m_pImage->m_pImage->DetachMask();
       m_pImageLoader->m_MatteColor = m_pImage->m_pImage->m_MatteColor;
     }
   }
   return ret;
 }
 FX_BOOL CPDF_ImageLoader::Load(const CPDF_ImageObject* pImage,
                                CPDF_PageRenderCache* pCache,
@@ skipping 38 matching lines @@
 }
 FX_BOOL CPDF_ImageLoader::Continue(void* LoadHandle, IFX_Pause* pPause) {
   return ((CPDF_ProgressiveImageLoaderHandle*)LoadHandle)->Continue(pPause);
 }
 CPDF_ImageLoader::~CPDF_ImageLoader() {
   if (!m_bCached) {
     delete m_pBitmap;
     delete m_pMask;
   }
 }