From fe0179ded8202939ea4f2b92a879b8dede7821ea Mon Sep 17 00:00:00 2001 From: tsepez Date: Thu, 22 Sep 2016 13:42:34 -0700 Subject: Rename CPDF_CountedObject to CFX_WeakPtr::Handle This better describes its purpose, and reduces confusion with the CFX_CountRef class, which is unrelated. The WeakPtr class itself that manipulates handles is NYI. Review-Url: https://codereview.chromium.org/2366673003 --- core/fpdfapi/fpdf_render/fpdf_render.cpp | 14 +++++++------- core/fpdfapi/fpdf_render/render_int.h | 6 +++--- 2 files changed, 10 insertions(+), 10 deletions(-) (limited to 'core/fpdfapi/fpdf_render') diff --git a/core/fpdfapi/fpdf_render/fpdf_render.cpp b/core/fpdfapi/fpdf_render/fpdf_render.cpp index 8043f932bb..0fdcb92ae1 100644 --- a/core/fpdfapi/fpdf_render/fpdf_render.cpp +++ b/core/fpdfapi/fpdf_render/fpdf_render.cpp @@ -45,7 +45,7 @@ CPDF_DocRenderData::~CPDF_DocRenderData() { void CPDF_DocRenderData::Clear(FX_BOOL bRelease) { for (auto it = m_Type3FaceMap.begin(); it != m_Type3FaceMap.end();) { auto curr_it = it++; - CPDF_CountedObject* cache = curr_it->second; + CFX_WeakPtr::Handle* cache = curr_it->second; if (bRelease || cache->use_count() < 2) { delete cache->get(); delete cache; @@ -55,7 +55,7 @@ void CPDF_DocRenderData::Clear(FX_BOOL bRelease) { for (auto it = m_TransferFuncMap.begin(); it != m_TransferFuncMap.end();) { auto curr_it = it++; - CPDF_CountedObject* value = curr_it->second; + CFX_WeakPtr::Handle* value = curr_it->second; if (bRelease || value->use_count() < 2) { delete value->get(); delete value; @@ -65,11 +65,11 @@ void CPDF_DocRenderData::Clear(FX_BOOL bRelease) { } CPDF_Type3Cache* CPDF_DocRenderData::GetCachedType3(CPDF_Type3Font* pFont) { - CPDF_CountedObject* pCache; + CFX_WeakPtr::Handle* pCache; auto it = m_Type3FaceMap.find(pFont); if (it == m_Type3FaceMap.end()) { CPDF_Type3Cache* pType3 = new CPDF_Type3Cache(pFont); - pCache = new CPDF_CountedObject(pType3); + pCache = new CFX_WeakPtr::Handle(pType3); m_Type3FaceMap[pFont] = pCache; } else { pCache = it->second; @@ -1086,7 +1086,7 @@ CPDF_TransferFunc* CPDF_DocRenderData::GetTransferFunc(CPDF_Object* pObj) { auto it = m_TransferFuncMap.find(pObj); if (it != m_TransferFuncMap.end()) { - CPDF_CountedObject* pTransferCounter = it->second; + CFX_WeakPtr::Handle* pTransferCounter = it->second; return pTransferCounter->AddRef(); } @@ -1109,8 +1109,8 @@ CPDF_TransferFunc* CPDF_DocRenderData::GetTransferFunc(CPDF_Object* pObj) { return nullptr; } CPDF_TransferFunc* pTransfer = new CPDF_TransferFunc(m_pPDFDoc); - CPDF_CountedObject* pTransferCounter = - new CPDF_CountedObject(pTransfer); + CFX_WeakPtr::Handle* pTransferCounter = + new CFX_WeakPtr::Handle(pTransfer); m_TransferFuncMap[pObj] = pTransferCounter; static const int kMaxOutputs = 16; FX_FLOAT output[kMaxOutputs]; diff --git a/core/fpdfapi/fpdf_render/render_int.h b/core/fpdfapi/fpdf_render/render_int.h index afd9c83b44..386da7661c 100644 --- a/core/fpdfapi/fpdf_render/render_int.h +++ b/core/fpdfapi/fpdf_render/render_int.h @@ -11,11 +11,11 @@ #include #include -#include "core/fpdfapi/fpdf_page/cpdf_countedobject.h" #include "core/fpdfapi/fpdf_page/cpdf_graphicstates.h" #include "core/fpdfapi/fpdf_page/include/cpdf_clippath.h" #include "core/fpdfapi/fpdf_parser/include/cpdf_stream_acc.h" #include "core/fpdfapi/fpdf_render/include/cpdf_renderoptions.h" +#include "core/fxcrt/include/cfx_weak_ptr.h" #include "core/fxge/include/cfx_fxgedevice.h" #include "core/fxge/include/cfx_renderdevice.h" @@ -76,9 +76,9 @@ class CPDF_DocRenderData { private: using CPDF_Type3CacheMap = - std::map*>; + std::map::Handle*>; using CPDF_TransferFuncMap = - std::map*>; + std::map::Handle*>; CPDF_Document* m_pPDFDoc; CPDF_Type3CacheMap m_Type3FaceMap; -- cgit v1.2.3