diff options
author | Tom Sepez <tsepez@chromium.org> | 2015-12-18 14:53:31 -0800 |
---|---|---|
committer | Tom Sepez <tsepez@chromium.org> | 2015-12-18 14:53:31 -0800 |
commit | 0fa6fee0e48af8681f0cd50f6a9471ecc0a46c11 (patch) | |
tree | 6e8b93a1103b71c3b83e35bc7308658521b49bde /core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp | |
parent | e6ca18ad72a1555e89dc37117c5be220631c5e0c (diff) | |
download | pdfium-0fa6fee0e48af8681f0cd50f6a9471ecc0a46c11.tar.xz |
Remove CFX_MapPtrToPtr in CFX_PageRenderCache
Rename CPDF_ImageCache to CPDF_ImageCacheEntry because it
represents a single entry, not the entire cache itself.
Delete unused ClearRenderCache method, and merge cache entry
clear() into its dtor.
Fix a broken size calculation.
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1539983002 .
Diffstat (limited to 'core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp')
-rw-r--r-- | core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp b/core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp index 7b34c5721a..fafba95527 100644 --- a/core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp +++ b/core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp @@ -1560,17 +1560,19 @@ FX_BOOL CPDF_ProgressiveImageLoaderHandle::Start( 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(); @@ -1583,15 +1585,17 @@ 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(); |