Make CPDF_Stream() take unique_ptr's to its dictionary.

core/fpdfapi/parser/cpdf_stream.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_PARSER_CPDF_STREAM_H_
 #define CORE_FPDFAPI_PARSER_CPDF_STREAM_H_
 
 #include <memory>
 #include <set>
 
 #include "core/fpdfapi/parser/cpdf_dictionary.h"
 #include "core/fpdfapi/parser/cpdf_object.h"
 #include "core/fxcrt/fx_basic.h"
 
 class CPDF_Stream : public CPDF_Object {
  public:
   CPDF_Stream();
 
   // Takes ownership of |pData| and |pDict|.

[Lei Zhang, 2016/11/18 23:50:34]

Update comment.

[Tom Sepez, 2016/11/19 00:05:16]

Done. I assume you meant removing the "and |pDict|" so we don't tell
you something you already know from the code.

-  CPDF_Stream(uint8_t* pData, uint32_t size, CPDF_Dictionary* pDict);
+  CPDF_Stream(uint8_t* pData,
+              uint32_t size,
+              std::unique_ptr<CPDF_Dictionary> pDict);
+
   ~CPDF_Stream() override;
 
   // CPDF_Object:
   Type GetType() const override;
   std::unique_ptr<CPDF_Object> Clone() const override;
   CPDF_Dictionary* GetDict() const override;
   CFX_WideString GetUnicodeText() const override;
   bool IsStream() const override;
   CPDF_Stream* AsStream() override;
   const CPDF_Stream* AsStream() const override;
 
   uint32_t GetRawSize() const { return m_dwSize; }
   uint8_t* GetRawData() const { return m_pDataBuf.get(); }
 
   // Does not takes onwership of |pData|, copies into internally-owned buffer.
   void SetData(const uint8_t* pData, uint32_t size);
 
-  void InitStream(const uint8_t* pData, uint32_t size, CPDF_Dictionary* pDict);
+  void InitStream(const uint8_t* pData,
+                  uint32_t size,
+                  std::unique_ptr<CPDF_Dictionary> pDict);
   void InitStreamFromFile(IFX_SeekableReadStream* pFile,
-                          CPDF_Dictionary* pDict);
+                          std::unique_ptr<CPDF_Dictionary> pDict);
 
   bool ReadRawData(FX_FILESIZE start_pos,
                    uint8_t* pBuf,
                    uint32_t buf_size) const;
 
   bool IsMemoryBased() const { return m_bMemoryBased; }
 
  protected:
   std::unique_ptr<CPDF_Object> CloneNonCyclic(
       bool bDirect,
@@ skipping 16 matching lines @@
 
 inline std::unique_ptr<CPDF_Stream> ToStream(std::unique_ptr<CPDF_Object> obj) {
   CPDF_Stream* pStream = ToStream(obj.get());
   if (!pStream)
     return nullptr;
   obj.release();
   return std::unique_ptr<CPDF_Stream>(pStream);
 }
 
 #endif  // CORE_FPDFAPI_PARSER_CPDF_STREAM_H_