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_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 +++---- 5 files changed, 15 insertions(+), 55 deletions(-) delete mode 100644 core/fpdfapi/fpdf_page/cpdf_countedobject.h (limited to 'core/fpdfapi/fpdf_page') diff --git a/core/fpdfapi/fpdf_page/cpdf_countedobject.h b/core/fpdfapi/fpdf_page/cpdf_countedobject.h deleted file mode 100644 index c61e024589..0000000000 --- a/core/fpdfapi/fpdf_page/cpdf_countedobject.h +++ /dev/null @@ -1,47 +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_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 983c9eab3f..f18a32d4d3 100644 --- a/core/fpdfapi/fpdf_page/cpdf_pattern.h +++ b/core/fpdfapi/fpdf_page/cpdf_pattern.h @@ -7,6 +7,7 @@ #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" @@ -42,4 +43,6 @@ 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 7fe2cc6c79..9386c19221 100644 --- a/core/fpdfapi/fpdf_page/cpdf_shadingpattern.h +++ b/core/fpdfapi/fpdf_page/cpdf_shadingpattern.h @@ -10,8 +10,9 @@ #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 fad85a147a..fc0433f52f 100644 --- a/core/fpdfapi/fpdf_page/include/cpdf_colorspace.h +++ b/core/fpdfapi/fpdf_page/include/cpdf_colorspace.h @@ -7,6 +7,7 @@ #ifndef CORE_FPDFAPI_FPDF_PAGE_INCLUDE_CPDF_COLORSPACE_H_ #define CORE_FPDFAPI_FPDF_PAGE_INCLUDE_CPDF_COLORSPACE_H_ +#include "core/fxcrt/include/cfx_weak_ptr.h" #include "core/fxcrt/include/fx_string.h" #include "core/fxcrt/include/fx_system.h" @@ -101,4 +102,6 @@ class CPDF_ColorSpace { uint32_t m_dwStdConversion; }; +using CPDF_CountedColorSpace = CFX_WeakPtr::Handle; + #endif // CORE_FPDFAPI_FPDF_PAGE_INCLUDE_CPDF_COLORSPACE_H_ diff --git a/core/fpdfapi/fpdf_page/pageint.h b/core/fpdfapi/fpdf_page/pageint.h index 427a363e8e..8b3f863e77 100644 --- a/core/fpdfapi/fpdf_page/pageint.h +++ b/core/fpdfapi/fpdf_page/pageint.h @@ -14,13 +14,14 @@ #include #include "core/fpdfapi/fpdf_page/cpdf_contentmark.h" -#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/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; @@ -29,7 +30,6 @@ 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 = CPDF_CountedObject; - using CPDF_CountedIccProfile = CPDF_CountedObject; - using CPDF_CountedImage = CPDF_CountedObject; - using CPDF_CountedStreamAcc = CPDF_CountedObject; + 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_ColorSpaceMap = std::map; -- cgit v1.2.3