2 files changed, 74 insertions, 69 deletions
diff --git a/core/fxcrt/include/cfx_count_ref.h b/core/fxcrt/include/cfx_count_ref.h
new file mode 100644
index 0000000000..cc7cf3d9ed
--- /dev/null
+++ b/core/fxcrt/include/cfx_count_ref.h
@@ -0,0 +1,74 @@
+// 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_COUNT_REF_H_
+#define CORE_FXCRT_INCLUDE_CFX_COUNT_REF_H_
+
+#include "core/fxcrt/include/cfx_retain_ptr.h"
+#include "core/fxcrt/include/fx_system.h"
+
+template <class ObjClass>
+class CFX_CountRef {
+ public:
+  CFX_CountRef() {}
+  CFX_CountRef(const CFX_CountRef& other) : m_pObject(other.m_pObject) {}
+  ~CFX_CountRef() {}
+
+  template <typename... Args>
+  ObjClass* New(Args... params) {
+    m_pObject.Reset(new CountedObj(params...));
+    return m_pObject.Get();
+  }
+
+  CFX_CountRef& operator=(const CFX_CountRef& that) {
+    if (*this != that)
+      m_pObject = that.m_pObject;
+    return *this;
+  }
+
+  void SetNull() { m_pObject.Reset(); }
+  bool IsNull() const { return !m_pObject; }
+  bool NotNull() const { return !IsNull(); }
+
+  const ObjClass* GetObject() const { return m_pObject.Get(); }
+
+  template <typename... Args>
+  ObjClass* GetModify(Args... params) {
+    if (!m_pObject)
+      return New(params...);
+    if (!m_pObject->HasOneRef())
+      m_pObject.Reset(new CountedObj(*m_pObject));
+    return m_pObject.Get();
+  }
+
+  bool operator==(const CFX_CountRef& that) const {
+    return m_pObject == that.m_pObject;
+  }
+  bool operator!=(const CFX_CountRef& that) const { return !(*this == that); }
+
+ protected:
+  class CountedObj : public ObjClass {
+   public:
+    template <typename... Args>
+    CountedObj(Args... params) : ObjClass(params...), m_RefCount(0) {}
+
+    CountedObj(const CountedObj& src) : ObjClass(src), m_RefCount(0) {}
+
+    bool HasOneRef() const { return m_RefCount == 1; }
+    void Retain() { m_RefCount++; }
+    void Release() {
+      if (--m_RefCount <= 0)
+        delete this;
+    }
+
+   private:
+    intptr_t m_RefCount;
+  };
+
+  CFX_RetainPtr<CountedObj> m_pObject;
+};
+
+#endif  // CORE_FXCRT_INCLUDE_CFX_COUNT_REF_H_
diff --git a/core/fxcrt/include/fx_basic.h b/core/fxcrt/include/fx_basic.h
index bc05a3479d..6a8988d5dc 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() {}