Make ownership explicit in CPDF_ContentMarkItem

core/fpdfapi/fpdf_page/cpdf_contentmarkitem.cpp

 // 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
 
 #include "core/fpdfapi/fpdf_page/cpdf_contentmarkitem.h"
 
 #include "core/fpdfapi/fpdf_parser/include/cpdf_dictionary.h"
 
 CPDF_ContentMarkItem::CPDF_ContentMarkItem()
-    : m_ParamType(None), m_pParam(nullptr) {}
+    : m_ParamType(None), m_pPropertiesDict(nullptr) {}
 
-CPDF_ContentMarkItem::CPDF_ContentMarkItem(const CPDF_ContentMarkItem& src) {
-  m_MarkName = src.m_MarkName;
-  m_ParamType = src.m_ParamType;
-  if (m_ParamType == DirectDict) {
-    m_pParam = ToDictionary(src.m_pParam->Clone());
-  } else {
-    m_pParam = src.m_pParam;
+CPDF_ContentMarkItem::CPDF_ContentMarkItem(const CPDF_ContentMarkItem& that)
+    : m_MarkName(that.m_MarkName),
+      m_ParamType(that.m_ParamType),
+      m_pPropertiesDict(that.m_pPropertiesDict) {
+  if (that.m_pDirectDict)
+    m_pDirectDict.reset(that.m_pDirectDict->Clone()->AsDictionary());
+}
+
+CPDF_ContentMarkItem::~CPDF_ContentMarkItem() {}
+
+CPDF_Dictionary* CPDF_ContentMarkItem::GetParam() const {
+  switch (m_ParamType) {
+    case PropertiesDict:
+      return m_pPropertiesDict;
+    case DirectDict:
+      return m_pDirectDict.get();
+    case None:
+    default:
+      return nullptr;
   }
 }
 
-CPDF_ContentMarkItem::~CPDF_ContentMarkItem() {
-  if (m_ParamType == DirectDict && m_pParam)
-    m_pParam->Release();
+FX_BOOL CPDF_ContentMarkItem::HasMCID() const {
+  CPDF_Dictionary* pDict = GetParam();
+  return pDict && pDict->KeyExist("MCID");
 }
 
-FX_BOOL CPDF_ContentMarkItem::HasMCID() const {
-  if (m_pParam &&
-      (m_ParamType == DirectDict || m_ParamType == PropertiesDict)) {
-    return m_pParam->KeyExist("MCID");
-  }
-  return FALSE;
+void CPDF_ContentMarkItem::SetDirectDict(
+    std::unique_ptr<CPDF_Dictionary, ReleaseDeleter<CPDF_Dictionary>> pDict) {
+  m_ParamType = DirectDict;
+  m_pDirectDict = std::move(pDict);
 }
+
+void CPDF_ContentMarkItem::SetPropertiesDict(CPDF_Dictionary* pDict) {
+  m_ParamType = PropertiesDict;
+  m_pPropertiesDict = pDict;
+}