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/fxcrt/include/cfx_weak_ptr.h | 48 --------------------------------------- 1 file changed, 48 deletions(-) delete mode 100644 core/fxcrt/include/cfx_weak_ptr.h (limited to 'core/fxcrt/include') 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