1 files changed, 23 insertions, 10 deletions
diff --git a/core/fpdfapi/page/cpdf_contentmark.cpp b/core/fpdfapi/page/cpdf_contentmark.cpp
index deddf3cc3e..77c29a53d7 100644
--- a/core/fpdfapi/page/cpdf_contentmark.cpp
+++ b/core/fpdfapi/page/cpdf_contentmark.cpp
@@ -12,35 +12,48 @@
 
 CPDF_ContentMark::CPDF_ContentMark() {}
 
-CPDF_ContentMark::CPDF_ContentMark(const CPDF_ContentMark& that)
-    : m_Ref(that.m_Ref) {}
-
 CPDF_ContentMark::~CPDF_ContentMark() {}
 
+std::unique_ptr<CPDF_ContentMark> CPDF_ContentMark::Clone() {
+  auto result = pdfium::MakeUnique<CPDF_ContentMark>();
+  if (m_Ref)
+    result->m_Ref.Reset(new MarkData(*m_Ref));
+
+  return result;
+}
+
 size_t CPDF_ContentMark::CountItems() const {
-  return m_Ref.GetObject()->CountItems();
+  return m_Ref->CountItems();
 }
 
 const CPDF_ContentMarkItem& CPDF_ContentMark::GetItem(size_t i) const {
   ASSERT(i < CountItems());
-  return m_Ref.GetObject()->GetItem(i);
+  return m_Ref->GetItem(i);
 }
 
 int CPDF_ContentMark::GetMarkedContentID() const {
-  const MarkData* pData = m_Ref.GetObject();
-  return pData ? pData->GetMarkedContentID() : -1;
+  if (!m_Ref)
+    return -1;
+
+  return m_Ref->GetMarkedContentID();
 }
 
 void CPDF_ContentMark::AddMark(ByteString name,
                                const CPDF_Dictionary* pDict,
                                bool bDirect) {
-  m_Ref.GetPrivateCopy()->AddMark(std::move(name), pDict, bDirect);
+  if (!m_Ref)
+    m_Ref.Reset(new MarkData());
+
+  m_Ref->AddMark(std::move(name), pDict, bDirect);
 }
 
 void CPDF_ContentMark::DeleteLastMark() {
-  m_Ref.GetPrivateCopy()->DeleteLastMark();
+  if (!m_Ref)
+    return;
+
+  m_Ref->DeleteLastMark();
   if (CountItems() == 0)
-    m_Ref.SetNull();
+    m_Ref.Reset();
 }
 
 CPDF_ContentMark::MarkData::MarkData() {}