From 0b95042db2e6dab5876abd12ce485fff0a8e08fe Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Thu, 21 Sep 2017 15:49:49 -0400 Subject: Rename CFX_RetainPtr to RetainPtr This CL renames CFX_RetainPtr to RetainPtr and places in the fxcrt namespace. Bug: pdfium:898 Change-Id: I8798a9f79cb0840d3f037e8d04937cedd742914e Reviewed-on: https://pdfium-review.googlesource.com/14616 Reviewed-by: Tom Sepez Commit-Queue: dsinclair --- core/fpdfapi/render/cpdf_imagecacheentry.cpp | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'core/fpdfapi/render/cpdf_imagecacheentry.cpp') diff --git a/core/fpdfapi/render/cpdf_imagecacheentry.cpp b/core/fpdfapi/render/cpdf_imagecacheentry.cpp index 4f98b96726..666839b0f2 100644 --- a/core/fpdfapi/render/cpdf_imagecacheentry.cpp +++ b/core/fpdfapi/render/cpdf_imagecacheentry.cpp @@ -18,9 +18,8 @@ #include "core/fpdfapi/render/cpdf_rendercontext.h" #include "core/fpdfapi/render/cpdf_renderstatus.h" -CPDF_ImageCacheEntry::CPDF_ImageCacheEntry( - CPDF_Document* pDoc, - const CFX_RetainPtr& pImage) +CPDF_ImageCacheEntry::CPDF_ImageCacheEntry(CPDF_Document* pDoc, + const RetainPtr& pImage) : m_dwTimeCount(0), m_MatteColor(0), m_pDocument(pDoc), @@ -29,7 +28,7 @@ CPDF_ImageCacheEntry::CPDF_ImageCacheEntry( CPDF_ImageCacheEntry::~CPDF_ImageCacheEntry() {} -void CPDF_ImageCacheEntry::Reset(const CFX_RetainPtr& pBitmap) { +void CPDF_ImageCacheEntry::Reset(const RetainPtr& pBitmap) { m_pCachedBitmap.Reset(); if (pBitmap) m_pCachedBitmap = pBitmap->Clone(nullptr); @@ -37,18 +36,18 @@ void CPDF_ImageCacheEntry::Reset(const CFX_RetainPtr& pBitmap) { } static uint32_t FPDF_ImageCache_EstimateImageSize( - const CFX_RetainPtr& pDIB) { + const RetainPtr& pDIB) { return pDIB && pDIB->GetBuffer() ? (uint32_t)pDIB->GetHeight() * pDIB->GetPitch() + (uint32_t)pDIB->GetPaletteSize() * 4 : 0; } -CFX_RetainPtr CPDF_ImageCacheEntry::DetachBitmap() { +RetainPtr CPDF_ImageCacheEntry::DetachBitmap() { return std::move(m_pCurBitmap); } -CFX_RetainPtr CPDF_ImageCacheEntry::DetachMask() { +RetainPtr CPDF_ImageCacheEntry::DetachMask() { return std::move(m_pCurMask); } -- cgit v1.2.3