Move CPDF_SyntaxParser init methods into ctor.

- CPDF_SyntaxParser can no longer be initialized multiple times.
- Make the file length and header offset const.
- Make the header offset type FX_FILESIZE consistently.
- Simplify for the common case where the header offset is 0.

Change-Id: I7138db1fbcec3b7578b0239b92fc1154fa4dc4ce
Reviewed-on: https://pdfium-review.googlesource.com/38850
Reviewed-by: Art Snake <art-snake@yandex-team.ru>
Commit-Queue: Lei Zhang <thestig@chromium.org>

1 files changed, 5 insertions, 5 deletions

diff --git a/core/fpdfapi/parser/cpdf_parser.h b/core/fpdfapi/parser/cpdf_parser.h
index 7cd98c2c26..c07c932cf4 100644
--- a/core/fpdfapi/parser/cpdf_parser.h
+++ b/core/fpdfapi/parser/cpdf_parser.h
@@ -116,11 +116,11 @@ class CPDF_Parser {
   using ObjectType = CPDF_CrossRefTable::ObjectType;
   using ObjectInfo = CPDF_CrossRefTable::ObjectInfo;
 
-  std::unique_ptr<CPDF_SyntaxParser> m_pSyntax;
-
   bool LoadCrossRefV4(FX_FILESIZE pos, bool bSkip);
   bool RebuildCrossRef();
 
+  std::unique_ptr<CPDF_SyntaxParser> m_pSyntax;
+
  private:
   friend class cpdf_parser_ParseStartXRefWithHeaderOffset_Test;
   friend class cpdf_parser_ParseStartXRef_Test;
@@ -169,9 +169,9 @@ class CPDF_Parser {
   std::unique_ptr<ParsedObjectsHolder> m_pOwnedObjectsHolder;
   UnownedPtr<ParsedObjectsHolder> m_pObjectsHolder;
 
-  bool m_bHasParsed;
-  bool m_bXRefStream;
-  int m_FileVersion;
+  bool m_bHasParsed = false;
+  bool m_bXRefStream = false;
+  int m_FileVersion = 0;
   // m_CrossRefTable must be destroyed after m_pSecurityHandler due to the
   // ownership of the ID array data.
   std::unique_ptr<CPDF_CrossRefTable> m_CrossRefTable;