From f0799fe84df4d86f25d342b03525f3016d674f86 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Tue, 28 Mar 2017 09:31:32 -0700 Subject: Revert "Revert "Refcount all CFX_DIBSources (and subclasses) all the time."" This reverts commit 31b08d4cdaa17d7a03f35e087096a77036af98ec. Re-landing the patch after fixing skia build issue. Change-Id: Ie7039890088b803a6ec5ce365d70f57277459b48 Reviewed-on: https://pdfium-review.googlesource.com/3245 Commit-Queue: Tom Sepez Commit-Queue: dsinclair Reviewed-by: dsinclair --- core/fpdfapi/page/cpdf_generalstate.h | 1 + core/fpdfapi/page/cpdf_image.cpp | 49 ++++++++++++++++------------------- core/fpdfapi/page/cpdf_image.h | 16 ++++++------ 3 files changed, 31 insertions(+), 35 deletions(-) (limited to 'core/fpdfapi/page') diff --git a/core/fpdfapi/page/cpdf_generalstate.h b/core/fpdfapi/page/cpdf_generalstate.h index ddc33ac800..1c5ddee4e0 100644 --- a/core/fpdfapi/page/cpdf_generalstate.h +++ b/core/fpdfapi/page/cpdf_generalstate.h @@ -7,6 +7,7 @@ #ifndef CORE_FPDFAPI_PAGE_CPDF_GENERALSTATE_H_ #define CORE_FPDFAPI_PAGE_CPDF_GENERALSTATE_H_ +#include "core/fxcrt/cfx_shared_copy_on_write.h" #include "core/fxcrt/fx_basic.h" #include "core/fxcrt/fx_coordinates.h" #include "core/fxge/fx_dib.h" diff --git a/core/fpdfapi/page/cpdf_image.cpp b/core/fpdfapi/page/cpdf_image.cpp index 3de0511771..4fc1c344ef 100644 --- a/core/fpdfapi/page/cpdf_image.cpp +++ b/core/fpdfapi/page/cpdf_image.cpp @@ -157,7 +157,7 @@ void CPDF_Image::SetJpegImageInline( m_pStream->InitStream(&(data[0]), size, std::move(pDict)); } -void CPDF_Image::SetImage(const CFX_DIBitmap* pBitmap) { +void CPDF_Image::SetImage(const CFX_RetainPtr& pBitmap) { int32_t BitmapWidth = pBitmap->GetWidth(); int32_t BitmapHeight = pBitmap->GetHeight(); if (BitmapWidth < 1 || BitmapHeight < 1) @@ -248,7 +248,7 @@ void CPDF_Image::SetImage(const CFX_DIBitmap* pBitmap) { bCopyWithoutAlpha = false; } - std::unique_ptr pMaskBitmap; + CFX_RetainPtr pMaskBitmap; if (pBitmap->HasAlpha()) pMaskBitmap = pBitmap->CloneAlphaMask(); @@ -320,28 +320,25 @@ void CPDF_Image::SetImage(const CFX_DIBitmap* pBitmap) { FX_Free(dest_buf); } -void CPDF_Image::ResetCache(CPDF_Page* pPage, const CFX_DIBitmap* pBitmap) { +void CPDF_Image::ResetCache(CPDF_Page* pPage, + const CFX_RetainPtr& pBitmap) { pPage->GetRenderCache()->ResetBitmap(m_pStream.Get(), pBitmap); } -std::unique_ptr CPDF_Image::LoadDIBSource() const { - auto source = pdfium::MakeUnique(); +CFX_RetainPtr CPDF_Image::LoadDIBSource() const { + auto source = pdfium::MakeRetain(); if (!source->Load(m_pDocument, m_pStream.Get())) return nullptr; - return std::move(source); + return source; } -CFX_DIBSource* CPDF_Image::DetachBitmap() { - CFX_DIBSource* pBitmap = m_pDIBSource; - m_pDIBSource = nullptr; - return pBitmap; +CFX_RetainPtr CPDF_Image::DetachBitmap() { + return std::move(m_pDIBSource); } -CFX_DIBSource* CPDF_Image::DetachMask() { - CFX_DIBSource* pBitmap = m_pMask; - m_pMask = nullptr; - return pBitmap; +CFX_RetainPtr CPDF_Image::DetachMask() { + return std::move(m_pMask); } bool CPDF_Image::StartLoadDIBSource(CPDF_Dictionary* pFormResource, @@ -349,35 +346,33 @@ bool CPDF_Image::StartLoadDIBSource(CPDF_Dictionary* pFormResource, bool bStdCS, uint32_t GroupFamily, bool bLoadMask) { - auto source = pdfium::MakeUnique(); + auto source = pdfium::MakeRetain(); int ret = source->StartLoadDIBSource(m_pDocument, m_pStream.Get(), true, pFormResource, pPageResource, bStdCS, GroupFamily, bLoadMask); - if (ret == 2) { - m_pDIBSource = source.release(); - return true; - } if (!ret) { - m_pDIBSource = nullptr; + m_pDIBSource.Reset(); return false; } + m_pDIBSource = source; + if (ret == 2) + return true; + m_pMask = source->DetachMask(); m_MatteColor = source->GetMatteColor(); - m_pDIBSource = source.release(); return false; } bool CPDF_Image::Continue(IFX_Pause* pPause) { - CPDF_DIBSource* pSource = static_cast(m_pDIBSource); + CFX_RetainPtr pSource = m_pDIBSource.As(); int ret = pSource->ContinueLoadDIBSource(pPause); - if (ret == 2) { - return true; - } if (!ret) { - delete m_pDIBSource; - m_pDIBSource = nullptr; + m_pDIBSource.Reset(); return false; } + if (ret == 2) + return true; + m_pMask = pSource->DetachMask(); m_MatteColor = pSource->GetMatteColor(); return false; diff --git a/core/fpdfapi/page/cpdf_image.h b/core/fpdfapi/page/cpdf_image.h index 1909498102..5b737e67b9 100644 --- a/core/fpdfapi/page/cpdf_image.h +++ b/core/fpdfapi/page/cpdf_image.h @@ -44,25 +44,25 @@ class CPDF_Image { bool IsMask() const { return m_bIsMask; } bool IsInterpol() const { return m_bInterpolate; } - std::unique_ptr LoadDIBSource() const; + CFX_RetainPtr LoadDIBSource() const; - void SetImage(const CFX_DIBitmap* pDIBitmap); + void SetImage(const CFX_RetainPtr& pDIBitmap); void SetJpegImage(const CFX_RetainPtr& pFile); void SetJpegImageInline(const CFX_RetainPtr& pFile); - void ResetCache(CPDF_Page* pPage, const CFX_DIBitmap* pDIBitmap); - + void ResetCache(CPDF_Page* pPage, + const CFX_RetainPtr& pDIBitmap); bool StartLoadDIBSource(CPDF_Dictionary* pFormResource, CPDF_Dictionary* pPageResource, bool bStdCS = false, uint32_t GroupFamily = 0, bool bLoadMask = false); bool Continue(IFX_Pause* pPause); - CFX_DIBSource* DetachBitmap(); - CFX_DIBSource* DetachMask(); + CFX_RetainPtr DetachBitmap(); + CFX_RetainPtr DetachMask(); - CFX_DIBSource* m_pDIBSource = nullptr; - CFX_DIBSource* m_pMask = nullptr; + CFX_RetainPtr m_pDIBSource; + CFX_RetainPtr m_pMask; uint32_t m_MatteColor = 0; private: -- cgit v1.2.3