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

1 files changed, 17 insertions, 16 deletions

diff --git a/core/fpdfapi/fpdf_page/cpdf_contentmark.cpp b/core/fpdfapi/fpdf_page/cpdf_contentmark.cpp
index 6e85d2940f..06a6a50443 100644
--- a/core/fpdfapi/fpdf_page/cpdf_contentmark.cpp
+++ b/core/fpdfapi/fpdf_page/cpdf_contentmark.cpp
@@ -6,33 +6,34 @@
 
 #include "core/fpdfapi/fpdf_page/cpdf_contentmark.h"
 
-FX_BOOL CPDF_ContentMark::HasMark(const CFX_ByteStringC& mark) const {
-  if (!m_pObject)
-    return FALSE;
+bool CPDF_ContentMark::HasMark(const CFX_ByteStringC& mark) const {
+  const CPDF_ContentMarkData* pData = GetObject();
+  if (!pData)
+    return false;
 
-  for (int i = 0; i < m_pObject->CountItems(); i++) {
-    CPDF_ContentMarkItem& item = m_pObject->GetItem(i);
-    if (item.GetName() == mark)
-      return TRUE;
+  for (int i = 0; i < pData->CountItems(); i++) {
+    if (pData->GetItem(i).GetName() == mark)
+      return true;
   }
-  return FALSE;
+  return false;
 }
 
-FX_BOOL CPDF_ContentMark::LookupMark(const CFX_ByteStringC& mark,
-                                     CPDF_Dictionary*& pDict) const {
-  if (!m_pObject)
-    return FALSE;
+bool CPDF_ContentMark::LookupMark(const CFX_ByteStringC& mark,
+                                  CPDF_Dictionary*& pDict) const {
+  const CPDF_ContentMarkData* pData = GetObject();
+  if (!pData)
+    return false;
 
-  for (int i = 0; i < m_pObject->CountItems(); i++) {
-    CPDF_ContentMarkItem& item = m_pObject->GetItem(i);
+  for (int i = 0; i < pData->CountItems(); i++) {
+    const CPDF_ContentMarkItem& item = pData->GetItem(i);
     if (item.GetName() == mark) {
       pDict = nullptr;
       if (item.GetParamType() == CPDF_ContentMarkItem::PropertiesDict ||
           item.GetParamType() == CPDF_ContentMarkItem::DirectDict) {
         pDict = item.GetParam();
       }
-      return TRUE;
+      return true;
     }
   }
-  return FALSE;
+  return false;
 }