Make ownership explicit in CPDF_ContentMarkItem

core/fpdfapi/fpdf_page/cpdf_contentmark.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_contentmark.h"
 
 #include "core/fpdfapi/fpdf_parser/include/cpdf_dictionary.h"
 #include "third_party/base/stl_util.h"
@@ skipping 48 matching lines @@
 
 bool CPDF_ContentMark::LookupMark(const CFX_ByteStringC& mark,
                                   CPDF_Dictionary*& pDict) const {
   const MarkData* pData = m_Ref.GetObject();
   if (!pData)
     return false;
 
   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();
-      }
+      pDict = item.GetParam();
       return true;
     }
   }
   return false;
 }
 
 CPDF_ContentMark::MarkData::MarkData() {}
 
 CPDF_ContentMark::MarkData::MarkData(const MarkData& src)
     : m_Marks(src.m_Marks) {}
 
 CPDF_ContentMark::MarkData::~MarkData() {}
 
 int CPDF_ContentMark::MarkData::CountItems() const {
   return pdfium::CollectionSize<int>(m_Marks);
 }
 
 CPDF_ContentMarkItem& CPDF_ContentMark::MarkData::GetItem(int index) {
   return m_Marks[index];
 }
 
 const CPDF_ContentMarkItem& CPDF_ContentMark::MarkData::GetItem(
     int index) const {
   return m_Marks[index];
 }
 
 int CPDF_ContentMark::MarkData::GetMCID() const {
   for (const auto& mark : m_Marks) {
-    CPDF_ContentMarkItem::ParamType type = mark.GetParamType();
-    if (type == CPDF_ContentMarkItem::PropertiesDict ||
-        type == CPDF_ContentMarkItem::DirectDict) {
-      CPDF_Dictionary* pDict = mark.GetParam();
-      if (pDict->KeyExist("MCID"))
-        return pDict->GetIntegerFor("MCID");
-    }
+    CPDF_Dictionary* pDict = mark.GetParam();
+    if (pDict && pDict->KeyExist("MCID"))
+      return pDict->GetIntegerFor("MCID");
   }
   return -1;
 }
 
 void CPDF_ContentMark::MarkData::AddMark(const CFX_ByteString& name,
                                          CPDF_Dictionary* pDict,
                                          FX_BOOL bDirect) {
   CPDF_ContentMarkItem item;
   item.SetName(name);
   if (pDict) {
     if (bDirect) {
-      item.SetParam(CPDF_ContentMarkItem::DirectDict,
-                    ToDictionary(pDict->Clone()));
+      item.SetDirectDict(
+          std::unique_ptr<CPDF_Dictionary, ReleaseDeleter<CPDF_Dictionary>>(
+              ToDictionary(pDict->Clone())));
     } else {
-      item.SetParam(CPDF_ContentMarkItem::PropertiesDict, pDict);
+      item.SetPropertiesDict(pDict);
     }
   }
-  m_Marks.push_back(item);
+  m_Marks.push_back(std::move(item));
 }
 
 void CPDF_ContentMark::MarkData::DeleteLastMark() {
   if (!m_Marks.empty())
     m_Marks.pop_back();
 }