Make CFX_CountRef<>::m_pObject private, add accessors, fix const-ness.

Hide the CountedObj class from the rest of the code.

Rename GetModify() to GetPrivateCopy(), since it turns out
there are places where we modify a potentially-shared copy.
Add non-const version of GetObject() to permit these.

Review-Url: https://codereview.chromium.org/2287633002

2 files changed, 6 insertions, 5 deletions

diff --git a/core/fxcrt/cfx_count_ref_unittest.cpp b/core/fxcrt/cfx_count_ref_unittest.cpp
index 11c7c9b86d..7651c93f25 100644
--- a/core/fxcrt/cfx_count_ref_unittest.cpp
+++ b/core/fxcrt/cfx_count_ref_unittest.cpp
@@ -109,16 +109,16 @@ TEST(fxcrt, CountRefGetModify) {
   Observer observer;
   {
     CFX_CountRef<Object> ptr;
-    EXPECT_NE(nullptr, ptr.GetModify(&observer, std::string("one")));
+    EXPECT_NE(nullptr, ptr.GetPrivateCopy(&observer, std::string("one")));
     EXPECT_EQ(1, observer.GetConstructionCount("one"));
     EXPECT_EQ(0, observer.GetDestructionCount("one"));
 
-    EXPECT_NE(nullptr, ptr.GetModify(&observer, std::string("one")));
+    EXPECT_NE(nullptr, ptr.GetPrivateCopy(&observer, std::string("one")));
     EXPECT_EQ(1, observer.GetConstructionCount("one"));
     EXPECT_EQ(0, observer.GetDestructionCount("one"));
     {
       CFX_CountRef<Object> other(ptr);
-      EXPECT_NE(nullptr, ptr.GetModify(&observer, std::string("one")));
+      EXPECT_NE(nullptr, ptr.GetPrivateCopy(&observer, std::string("one")));
       EXPECT_EQ(2, observer.GetConstructionCount("one"));
       EXPECT_EQ(0, observer.GetDestructionCount("one"));
     }
diff --git a/core/fxcrt/include/cfx_count_ref.h b/core/fxcrt/include/cfx_count_ref.h
index 7dbd5dfe26..817ce95add 100644
--- a/core/fxcrt/include/cfx_count_ref.h
+++ b/core/fxcrt/include/cfx_count_ref.h
@@ -30,10 +30,11 @@ class CFX_CountRef {
   }
 
   void SetNull() { m_pObject.Reset(); }
+  ObjClass* GetObject() { return m_pObject.Get(); }
   const ObjClass* GetObject() const { return m_pObject.Get(); }
 
   template <typename... Args>
-  ObjClass* GetModify(Args... params) {
+  ObjClass* GetPrivateCopy(Args... params) {
     if (!m_pObject)
       return New(params...);
     if (!m_pObject->HasOneRef())
@@ -47,7 +48,7 @@ class CFX_CountRef {
   bool operator!=(const CFX_CountRef& that) const { return !(*this == that); }
   operator bool() const { return m_pObject; }
 
- protected:
+ private:
   class CountedObj : public ObjClass {
    public:
     template <typename... Args>