Flip document and parser ownership

core/fpdfapi/fpdf_parser/include/cpdf_parser.h

Index: core/fpdfapi/fpdf_parser/include/cpdf_parser.h
diff --git a/core/fpdfapi/fpdf_parser/include/cpdf_parser.h b/core/fpdfapi/fpdf_parser/include/cpdf_parser.h
index a69f0fe38eb49cea32fdc7563a4cf5abb00ddac6..d6a5d5703b7088a94495b20d034e31e971bba763 100644
--- a/core/fpdfapi/fpdf_parser/include/cpdf_parser.h
+++ b/core/fpdfapi/fpdf_parser/include/cpdf_parser.h
@@ -37,17 +37,14 @@ class CPDF_Parser {
   CPDF_Parser();
   ~CPDF_Parser();
 
-  Error StartParse(IFX_FileRead* pFile,
-                   std::unique_ptr<CPDF_Document> pDocument);
-
-  Error StartLinearizedParse(IFX_FileRead* pFile,
-                             std::unique_ptr<CPDF_Document> pDocument);
+  Error StartParse(IFX_FileRead* pFile, CPDF_Document* pDocument);
+  Error StartLinearizedParse(IFX_FileRead* pFile, CPDF_Document* pDocument);
 
   void SetPassword(const FX_CHAR* password) { m_Password = password; }
   CFX_ByteString GetPassword() { return m_Password; }
   CPDF_Dictionary* GetTrailer() const { return m_pTrailer; }
   FX_FILESIZE GetLastXRefOffset() const { return m_LastXRefOffset; }
-  CPDF_Document* GetDocument() const { return m_pDocument.get(); }
+  CPDF_Document* GetDocument() const { return m_pDocument; }
 
   uint32_t GetPermissions() const;
   uint32_t GetRootObjNum();
@@ -120,7 +117,7 @@ class CPDF_Parser {
   // the objects.
   bool VerifyCrossRefV4();
 
-  std::unique_ptr<CPDF_Document> m_pDocument;
+  CPDF_Document* m_pDocument;  // not owned

[Tom Sepez, 2016/08/24 16:38:52]

pity this can't be CPDF_Document* const m_pDocument and we pass the doc in the
ctor ... or can it?

[dsinclair, 2016/08/24 17:30:47]

At the moment, no.

Two reasons:
CPDF_Document accepts CPDF_Parser in it's ctor as a unique_ptr, so this can't
accept the document in it's ctor.

The CloseParser method sets the document to a nullptr. So, in theory, we can use
the parser multiple times given a different document to Start*Parse each time. I
don't know if we do it in practice, but needs to be tracked down and
CloseParser() either removed or made to stop changing the document.

   std::unique_ptr<CPDF_SyntaxParser> m_pSyntax;
   bool m_bOwnFileRead;
   int m_FileVersion;