From 8c41b1bf9fb7dd525f3a6b81d38f61d83500894d Mon Sep 17 00:00:00 2001 From: tsepez Date: Wed, 28 Sep 2016 13:21:30 -0700 Subject: Revert "Rename CPDF_CountedObject to CFX_WeakPtr::Handle" This reverts commit fe0179ded8202939ea4f2b92a879b8dede7821ea. This is blocking incremental revision, will try again. Review-Url: https://codereview.chromium.org/2377033003 --- core/fpdfapi/fpdf_page/cpdf_countedobject.h | 47 +++++++++++++++++++++++ core/fpdfapi/fpdf_page/cpdf_pattern.h | 3 -- core/fpdfapi/fpdf_page/cpdf_shadingpattern.h | 3 +- core/fpdfapi/fpdf_page/include/cpdf_colorspace.h | 3 -- core/fpdfapi/fpdf_page/pageint.h | 14 +++---- core/fpdfapi/fpdf_render/fpdf_render.cpp | 14 +++---- core/fpdfapi/fpdf_render/render_int.h | 6 +-- core/fxcrt/include/cfx_weak_ptr.h | 48 ------------------------ 8 files changed, 65 insertions(+), 73 deletions(-) create mode 100644 core/fpdfapi/fpdf_page/cpdf_countedobject.h delete mode 100644 core/fxcrt/include/cfx_weak_ptr.h (limited to 'core') diff --git a/core/fpdfapi/fpdf_page/cpdf_countedobject.h b/core/fpdfapi/fpdf_page/cpdf_countedobject.h new file mode 100644 index 0000000000..c61e024589 --- /dev/null +++ b/core/fpdfapi/fpdf_page/cpdf_countedobject.h @@ -0,0 +1,47 @@ +// Copyright 2016 PDFium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com + +#ifndef CORE_FPDFAPI_FPDF_PAGE_CPDF_COUNTEDOBJECT_H_ +#define CORE_FPDFAPI_FPDF_PAGE_CPDF_COUNTEDOBJECT_H_ + +#include "core/fpdfapi/fpdf_page/cpdf_pattern.h" +#include "core/fpdfapi/fpdf_page/include/cpdf_colorspace.h" +#include "core/fxcrt/include/fx_system.h" + +template +class CPDF_CountedObject { + public: + explicit CPDF_CountedObject(T* ptr) : m_nCount(1), m_pObj(ptr) {} + void reset(T* ptr) { // CAUTION: tosses prior ref counts. + m_nCount = 1; + m_pObj = ptr; + } + void clear() { // Now you're all weak ptrs ... + // Guard against accidental re-entry. + T* pObj = m_pObj; + m_pObj = nullptr; + delete pObj; + } + T* get() const { return m_pObj; } + T* AddRef() { + ASSERT(m_pObj); + ++m_nCount; + return m_pObj; + } + void RemoveRef() { + if (m_nCount) + --m_nCount; + } + size_t use_count() const { return m_nCount; } + + protected: + size_t m_nCount; + T* m_pObj; +}; +using CPDF_CountedColorSpace = CPDF_CountedObject; +using CPDF_CountedPattern = CPDF_CountedObject; + +#endif // CORE_FPDFAPI_FPDF_PAGE_CPDF_COUNTEDOBJECT_H_ diff --git a/core/fpdfapi/fpdf_page/cpdf_pattern.h b/core/fpdfapi/fpdf_page/cpdf_pattern.h index f18a32d4d3..983c9eab3f 100644 --- a/core/fpdfapi/fpdf_page/cpdf_pattern.h +++ b/core/fpdfapi/fpdf_page/cpdf_pattern.h @@ -7,7 +7,6 @@ #ifndef CORE_FPDFAPI_FPDF_PAGE_CPDF_PATTERN_H_ #define CORE_FPDFAPI_FPDF_PAGE_CPDF_PATTERN_H_ -#include "core/fxcrt/include/cfx_weak_ptr.h" #include "core/fxcrt/include/fx_coordinates.h" #include "core/fxcrt/include/fx_system.h" @@ -43,6 +42,4 @@ class CPDF_Pattern { const CFX_Matrix m_ParentMatrix; }; -using CPDF_CountedPattern = CFX_WeakPtr::Handle; - #endif // CORE_FPDFAPI_FPDF_PAGE_CPDF_PATTERN_H_ diff --git a/core/fpdfapi/fpdf_page/cpdf_shadingpattern.h b/core/fpdfapi/fpdf_page/cpdf_shadingpattern.h index 9386c19221..7fe2cc6c79 100644 --- a/core/fpdfapi/fpdf_page/cpdf_shadingpattern.h +++ b/core/fpdfapi/fpdf_page/cpdf_shadingpattern.h @@ -10,9 +10,8 @@ #include #include +#include "core/fpdfapi/fpdf_page/cpdf_countedobject.h" #include "core/fpdfapi/fpdf_page/cpdf_pattern.h" -#include "core/fpdfapi/fpdf_page/include/cpdf_colorspace.h" -#include "core/fxcrt/include/cfx_weak_ptr.h" #include "core/fxcrt/include/fx_system.h" enum ShadingType { diff --git a/core/fpdfapi/fpdf_page/include/cpdf_colorspace.h b/core/fpdfapi/fpdf_page/include/cpdf_colorspace.h index 2166f9b3a8..19aadbf704 100644 --- a/core/fpdfapi/fpdf_page/include/cpdf_colorspace.h +++ b/core/fpdfapi/fpdf_page/include/cpdf_colorspace.h @@ -9,7 +9,6 @@ #include -#include "core/fxcrt/include/cfx_weak_ptr.h" #include "core/fxcrt/include/fx_string.h" #include "core/fxcrt/include/fx_system.h" @@ -105,8 +104,6 @@ class CPDF_ColorSpace { uint32_t m_dwStdConversion; }; -using CPDF_CountedColorSpace = CFX_WeakPtr::Handle; - namespace std { // Make std::unique_ptr call Release() rather than diff --git a/core/fpdfapi/fpdf_page/pageint.h b/core/fpdfapi/fpdf_page/pageint.h index 8b3f863e77..427a363e8e 100644 --- a/core/fpdfapi/fpdf_page/pageint.h +++ b/core/fpdfapi/fpdf_page/pageint.h @@ -14,14 +14,13 @@ #include #include "core/fpdfapi/fpdf_page/cpdf_contentmark.h" -#include "core/fpdfapi/fpdf_page/cpdf_pattern.h" -#include "core/fpdfapi/fpdf_page/include/cpdf_colorspace.h" +#include "core/fpdfapi/fpdf_page/cpdf_countedobject.h" #include "core/fpdfapi/fpdf_page/include/cpdf_pageobjectholder.h" -#include "core/fxcrt/include/cfx_weak_ptr.h" #include "core/fxge/include/cfx_pathdata.h" #include "core/fxge/include/cfx_renderdevice.h" class CPDF_AllStates; +class CPDF_ColorSpace; class CPDF_ExpIntFunc; class CPDF_Font; class CPDF_FontEncoding; @@ -30,6 +29,7 @@ class CPDF_IccProfile; class CPDF_Image; class CPDF_ImageObject; class CPDF_Page; +class CPDF_Pattern; class CPDF_SampledFunc; class CPDF_StitchFunc; class CPDF_StreamAcc; @@ -345,10 +345,10 @@ class CPDF_DocPageData { CPDF_CountedPattern* FindPatternPtr(CPDF_Object* pPatternObj) const; private: - using CPDF_CountedFont = CFX_WeakPtr::Handle; - using CPDF_CountedIccProfile = CFX_WeakPtr::Handle; - using CPDF_CountedImage = CFX_WeakPtr::Handle; - using CPDF_CountedStreamAcc = CFX_WeakPtr::Handle; + using CPDF_CountedFont = CPDF_CountedObject; + using CPDF_CountedIccProfile = CPDF_CountedObject; + using CPDF_CountedImage = CPDF_CountedObject; + using CPDF_CountedStreamAcc = CPDF_CountedObject; using CPDF_ColorSpaceMap = std::map; diff --git a/core/fpdfapi/fpdf_render/fpdf_render.cpp b/core/fpdfapi/fpdf_render/fpdf_render.cpp index 0fdcb92ae1..8043f932bb 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++; - CFX_WeakPtr::Handle* cache = curr_it->second; + CPDF_CountedObject* 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++; - CFX_WeakPtr::Handle* value = curr_it->second; + CPDF_CountedObject* 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) { - CFX_WeakPtr::Handle* pCache; + CPDF_CountedObject* pCache; auto it = m_Type3FaceMap.find(pFont); if (it == m_Type3FaceMap.end()) { CPDF_Type3Cache* pType3 = new CPDF_Type3Cache(pFont); - pCache = new CFX_WeakPtr::Handle(pType3); + pCache = new CPDF_CountedObject(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()) { - CFX_WeakPtr::Handle* pTransferCounter = it->second; + CPDF_CountedObject* 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); - CFX_WeakPtr::Handle* pTransferCounter = - new CFX_WeakPtr::Handle(pTransfer); + CPDF_CountedObject* pTransferCounter = + new CPDF_CountedObject(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 386da7661c..afd9c83b44 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::Handle*>; + std::map*>; using CPDF_TransferFuncMap = - std::map::Handle*>; + std::map*>; CPDF_Document* m_pPDFDoc; CPDF_Type3CacheMap m_Type3FaceMap; diff --git a/core/fxcrt/include/cfx_weak_ptr.h b/core/fxcrt/include/cfx_weak_ptr.h deleted file mode 100644 index ea71cd01fd..0000000000 --- a/core/fxcrt/include/cfx_weak_ptr.h +++ /dev/null @@ -1,48 +0,0 @@ -// Copyright 2016 PDFium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com - -#ifndef CORE_FXCRT_INCLUDE_CFX_WEAK_PTR_H_ -#define CORE_FXCRT_INCLUDE_CFX_WEAK_PTR_H_ - -#include "core/fxcrt/include/fx_system.h" - -template -class CFX_WeakPtr { - public: - class Handle { - public: - explicit Handle(T* ptr) : m_nCount(1), m_pObj(ptr) {} - void reset(T* ptr) { // CAUTION: tosses prior ref counts. - m_nCount = 1; - m_pObj = ptr; - } - void clear() { // Now you're all weak ptrs ... - // Guard against accidental re-entry. - T* pObj = m_pObj; - m_pObj = nullptr; - delete pObj; - } - T* get() const { return m_pObj; } - T* AddRef() { - ASSERT(m_pObj); - ++m_nCount; - return m_pObj; - } - void RemoveRef() { - if (m_nCount) - --m_nCount; - } - size_t use_count() const { return m_nCount; } - - protected: - size_t m_nCount; - T* m_pObj; - }; - - // TODO(tsepez): implement weak pointer operations themselves. -}; - -#endif // CORE_FXCRT_INCLUDE_CFX_WEAK_PTR_H_ -- cgit v1.2.3