Make ownership explicit in CPDF_ContentMarkItem

core/fpdfapi/fpdf_page/cpdf_contentmarkitem.h

 // 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
 
 #ifndef CORE_FPDFAPI_FPDF_PAGE_CPDF_CONTENTMARKITEM_H_
 #define CORE_FPDFAPI_FPDF_PAGE_CPDF_CONTENTMARKITEM_H_

[dsinclair, 2016/09/21 19:34:43]

#include <memory>

[Tom Sepez, 2016/09/21 20:04:44]

Done.

 
+#include "core/fxcrt/include/fx_memory.h"
 #include "core/fxcrt/include/fx_string.h"
 #include "core/fxcrt/include/fx_system.h"
 
 class CPDF_Dictionary;
 
 class CPDF_ContentMarkItem {
  public:
   enum ParamType { None, PropertiesDict, DirectDict };
 
   CPDF_ContentMarkItem();
-  CPDF_ContentMarkItem(const CPDF_ContentMarkItem& src);
+  CPDF_ContentMarkItem(const CPDF_ContentMarkItem& that);
   ~CPDF_ContentMarkItem();
 
-  const CFX_ByteString& GetName() const { return m_MarkName; }
+  CPDF_ContentMarkItem& operator=(CPDF_ContentMarkItem&& other) = default;
+
+  CFX_ByteString GetName() const { return m_MarkName; }
   ParamType GetParamType() const { return m_ParamType; }
-  CPDF_Dictionary* GetParam() const { return m_pParam; }
+  CPDF_Dictionary* GetParam() const;
   FX_BOOL HasMCID() const;
+
   void SetName(const CFX_ByteString& name) { m_MarkName = name; }
-  void SetParam(ParamType type, CPDF_Dictionary* param) {
-    m_ParamType = type;
-    m_pParam = param;
-  }
+  void SetDirectDict(
+      std::unique_ptr<CPDF_Dictionary, ReleaseDeleter<CPDF_Dictionary>> pDict);
+  void SetPropertiesDict(CPDF_Dictionary* pDict);
 
  private:
   CFX_ByteString m_MarkName;
   ParamType m_ParamType;
-  CPDF_Dictionary* m_pParam;
+  CPDF_Dictionary* m_pPropertiesDict;

[dsinclair, 2016/09/21 19:34:43]

nit: Add a not owned comment?

[Tom Sepez, 2016/09/21 20:06:49]

will do.

+  std::unique_ptr<CPDF_Dictionary, ReleaseDeleter<CPDF_Dictionary>>
+      m_pDirectDict;
 };
 
 #endif  // CORE_FPDFAPI_FPDF_PAGE_CPDF_CONTENTMARKITEM_H_