From 66601c4c3d89afc6b9b41a5d14359fe94222cc3a Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Tue, 2 Oct 2018 18:58:16 +0000 Subject: Remove dead code in CPDF_PageRenderCache::ResetBitmap(). Callers only ever pass in nullptr for the bitmap parameter. Change-Id: Iefeb72a1268521a38b3d5ab4b03163b67bf35796 Reviewed-on: https://pdfium-review.googlesource.com/43210 Reviewed-by: Henrique Nakashima Commit-Queue: Lei Zhang --- core/fpdfapi/render/cpdf_pagerendercache.cpp | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) (limited to 'core/fpdfapi/render/cpdf_pagerendercache.cpp') diff --git a/core/fpdfapi/render/cpdf_pagerendercache.cpp b/core/fpdfapi/render/cpdf_pagerendercache.cpp index 61602d36f0..dfd05bc494 100644 --- a/core/fpdfapi/render/cpdf_pagerendercache.cpp +++ b/core/fpdfapi/render/cpdf_pagerendercache.cpp @@ -13,6 +13,7 @@ #include "core/fpdfapi/page/cpdf_page.h" #include "core/fpdfapi/render/cpdf_imagecacheentry.h" #include "core/fpdfapi/render/cpdf_renderstatus.h" +#include "core/fxge/dib/cfx_dibitmap.h" namespace { @@ -125,21 +126,15 @@ bool CPDF_PageRenderCache::Continue(PauseIndicatorIface* pPause, return false; } -void CPDF_PageRenderCache::ResetBitmap(const RetainPtr& pImage, - const RetainPtr& pBitmap) { +void CPDF_PageRenderCache::ResetBitmap(const RetainPtr& pImage) { CPDF_ImageCacheEntry* pEntry; CPDF_Stream* pStream = pImage->GetStream(); const auto it = m_ImageCache.find(pStream); - if (it == m_ImageCache.end()) { - if (!pBitmap) - return; + if (it == m_ImageCache.end()) + return; - pEntry = new CPDF_ImageCacheEntry(m_pPage->GetDocument(), pImage); - m_ImageCache[pStream] = pEntry; - } else { - pEntry = it->second; - } + pEntry = it->second; m_nCacheSize -= pEntry->EstimateSize(); - pEntry->Reset(pBitmap); + pEntry->Reset(nullptr); m_nCacheSize += pEntry->EstimateSize(); } -- cgit v1.2.3