From 31b08d4cdaa17d7a03f35e087096a77036af98ec Mon Sep 17 00:00:00 2001 From: dsinclair Date: Tue, 28 Mar 2017 15:47:47 +0000 Subject: Revert "Refcount all CFX_DIBSources (and subclasses) all the time." This reverts commit 0004f29bf6ee3c6060a272c79f14993e92e053c7. Reason for revert: Breaks build with skia_paths enabled (which will break the chrome roll). ../../third_party/pdfium/core/fxge/skia/fx_skia_device.cpp:1858:38: error: no member named 'get' in 'CFX_RetainPtr' ../../third_party/pdfium/core/fxge/skia/fx_skia_device.cpp:1861:42: error: no member named 'get' in 'CFX_RetainPtr' ../../third_party/pdfium/core/fxge/skia/fx_skia_device.cpp:2987:15: error: no viable overloaded '=' ../../third_party/pdfium/core/fxge/skia/fx_skia_device.cpp:2991:18: error: no viable overloaded '=' ../../third_party/pdfium/core/fxge/skia/fx_skia_device.cpp:2999:17: error: no viable overloaded '=' ../../third_party/pdfium/core/fxge/skia/fx_skia_device.cpp:3001:43: error: no member named 'GetObject' in 'CFX_RetainPtr' Original change's description: > Refcount all CFX_DIBSources (and subclasses) all the time. > > There are currently several ownership models for these objects, > including ad-hoc logic for sharing and deletion, and the > now-redundant CFX_DIBitmapRef externally-counted handle to the DIBs. > > Replace them all with the internal refcount scheme. > > Change-Id: I2db399dfc19219eda384f94cc989353b78ce2872 > Reviewed-on: https://pdfium-review.googlesource.com/3166 > Reviewed-by: dsinclair > Commit-Queue: dsinclair > TBR=thestig@chromium.org,tsepez@chromium.org,dsinclair@chromium.org,pdfium-reviews@googlegroups.com NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true Change-Id: I678b1fbc5e666cf7a19372ebaff3270fb115ba5e Reviewed-on: https://pdfium-review.googlesource.com/3243 Reviewed-by: dsinclair Commit-Queue: 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, 35 insertions(+), 31 deletions(-) (limited to 'core/fpdfapi/page') diff --git a/core/fpdfapi/page/cpdf_generalstate.h b/core/fpdfapi/page/cpdf_generalstate.h index 1c5ddee4e0..ddc33ac800 100644 --- a/core/fpdfapi/page/cpdf_generalstate.h +++ b/core/fpdfapi/page/cpdf_generalstate.h @@ -7,7 +7,6 @@ #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 4fc1c344ef..3de0511771 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_RetainPtr& pBitmap) { +void CPDF_Image::SetImage(const CFX_DIBitmap* 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_RetainPtr& pBitmap) { bCopyWithoutAlpha = false; } - CFX_RetainPtr pMaskBitmap; + std::unique_ptr pMaskBitmap; if (pBitmap->HasAlpha()) pMaskBitmap = pBitmap->CloneAlphaMask(); @@ -320,25 +320,28 @@ void CPDF_Image::SetImage(const CFX_RetainPtr& pBitmap) { FX_Free(dest_buf); } -void CPDF_Image::ResetCache(CPDF_Page* pPage, - const CFX_RetainPtr& pBitmap) { +void CPDF_Image::ResetCache(CPDF_Page* pPage, const CFX_DIBitmap* pBitmap) { pPage->GetRenderCache()->ResetBitmap(m_pStream.Get(), pBitmap); } -CFX_RetainPtr CPDF_Image::LoadDIBSource() const { - auto source = pdfium::MakeRetain(); +std::unique_ptr CPDF_Image::LoadDIBSource() const { + auto source = pdfium::MakeUnique(); if (!source->Load(m_pDocument, m_pStream.Get())) return nullptr; - return source; + return std::move(source); } -CFX_RetainPtr CPDF_Image::DetachBitmap() { - return std::move(m_pDIBSource); +CFX_DIBSource* CPDF_Image::DetachBitmap() { + CFX_DIBSource* pBitmap = m_pDIBSource; + m_pDIBSource = nullptr; + return pBitmap; } -CFX_RetainPtr CPDF_Image::DetachMask() { - return std::move(m_pMask); +CFX_DIBSource* CPDF_Image::DetachMask() { + CFX_DIBSource* pBitmap = m_pMask; + m_pMask = nullptr; + return pBitmap; } bool CPDF_Image::StartLoadDIBSource(CPDF_Dictionary* pFormResource, @@ -346,33 +349,35 @@ bool CPDF_Image::StartLoadDIBSource(CPDF_Dictionary* pFormResource, bool bStdCS, uint32_t GroupFamily, bool bLoadMask) { - auto source = pdfium::MakeRetain(); + auto source = pdfium::MakeUnique(); 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.Reset(); + m_pDIBSource = nullptr; 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) { - CFX_RetainPtr pSource = m_pDIBSource.As(); + CPDF_DIBSource* pSource = static_cast(m_pDIBSource); int ret = pSource->ContinueLoadDIBSource(pPause); + if (ret == 2) { + return true; + } if (!ret) { - m_pDIBSource.Reset(); + delete m_pDIBSource; + m_pDIBSource = nullptr; 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 5b737e67b9..1909498102 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; } - CFX_RetainPtr LoadDIBSource() const; + std::unique_ptr LoadDIBSource() const; - void SetImage(const CFX_RetainPtr& pDIBitmap); + void SetImage(const CFX_DIBitmap* pDIBitmap); void SetJpegImage(const CFX_RetainPtr& pFile); void SetJpegImageInline(const CFX_RetainPtr& pFile); - void ResetCache(CPDF_Page* pPage, - const CFX_RetainPtr& pDIBitmap); + void ResetCache(CPDF_Page* pPage, const CFX_DIBitmap* 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_RetainPtr DetachBitmap(); - CFX_RetainPtr DetachMask(); + CFX_DIBSource* DetachBitmap(); + CFX_DIBSource* DetachMask(); - CFX_RetainPtr m_pDIBSource; - CFX_RetainPtr m_pMask; + CFX_DIBSource* m_pDIBSource = nullptr; + CFX_DIBSource* m_pMask = nullptr; uint32_t m_MatteColor = 0; private: -- cgit v1.2.3