Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1393)

Unified Diff: core/fxcrt/include/fx_basic.h

Issue 2281683002: Rework CFX_CountRef in terms of CFX_RetainPtr (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master
Patch Set: Add test that GetModify() may construct a duplicate Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « core/fxcrt/include/cfx_count_ref.h ('k') | core/fxge/include/fx_dib.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: core/fxcrt/include/fx_basic.h
diff --git a/core/fxcrt/include/fx_basic.h b/core/fxcrt/include/fx_basic.h
index bc05a3479dacd5038ef4d780e3b011413089eca2..6a8988d5dc895061badbd8cf00cc35cf96e3598d 100644
--- a/core/fxcrt/include/fx_basic.h
+++ b/core/fxcrt/include/fx_basic.h
@@ -649,75 +649,6 @@ class CFX_BitStream {
const uint8_t* m_pData;
};
-template <class ObjClass>
-class CFX_CountRef {
- public:
- using Ref = CFX_CountRef<ObjClass>;
-
- class CountedObj : public ObjClass {
- public:
- CountedObj() {}
- CountedObj(const CountedObj& src) : ObjClass(src) {}
-
- int m_RefCount;
- };
-
- CFX_CountRef() : m_pObject(nullptr) {}
- CFX_CountRef(const Ref& ref) : m_pObject(ref.m_pObject) {
- if (m_pObject)
- m_pObject->m_RefCount++;
- }
-
- ~CFX_CountRef() { SetNull(); }
-
- ObjClass* New() {
- SetNull();
- m_pObject = new CountedObj;
- m_pObject->m_RefCount = 1;
- return m_pObject;
- }
-
- void operator=(const Ref& ref) {
- if (ref.m_pObject)
- ref.m_pObject->m_RefCount++;
- SetNull();
- m_pObject = ref.m_pObject;
- }
-
- bool IsNull() const { return !m_pObject; }
- bool NotNull() const { return !IsNull(); }
-
- const ObjClass* GetObject() const { return m_pObject; }
- ObjClass* GetModify() {
- if (!m_pObject) {
- m_pObject = new CountedObj;
- m_pObject->m_RefCount = 1;
- } else if (m_pObject->m_RefCount > 1) {
- m_pObject->m_RefCount--;
- CountedObj* pOldObject = m_pObject;
- m_pObject = new CountedObj(*pOldObject);
- m_pObject->m_RefCount = 1;
- }
- return m_pObject;
- }
-
- void SetNull() {
- if (!m_pObject) {
- return;
- }
- m_pObject->m_RefCount--;
- if (m_pObject->m_RefCount <= 0) {
- delete m_pObject;
- }
- m_pObject = nullptr;
- }
-
- bool operator==(const Ref& ref) const { return m_pObject == ref.m_pObject; }
-
- protected:
- CountedObj* m_pObject;
-};
-
class IFX_Pause {
public:
virtual ~IFX_Pause() {}
« no previous file with comments | « core/fxcrt/include/cfx_count_ref.h ('k') | core/fxge/include/fx_dib.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698