Cleanup CPDF_Stream:

core/include/fpdfapi/fpdf_objects.h

 // Copyright 2014 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_INCLUDE_FPDFAPI_FPDF_OBJECTS_H_
 #define CORE_INCLUDE_FPDFAPI_FPDF_OBJECTS_H_
 
 #include "../fxcrt/fx_coordinates.h"
@@ skipping 448 matching lines @@
 };
 inline CPDF_Dictionary* ToDictionary(CPDF_Object* obj) {
   return obj ? obj->AsDictionary() : nullptr;
 }
 inline const CPDF_Dictionary* ToDictionary(const CPDF_Object* obj) {
   return obj ? obj->AsDictionary() : nullptr;
 }
 
 class CPDF_Stream : public CPDF_Object {
  public:
-  static CPDF_Stream* Create(uint8_t* pData,
-                             FX_DWORD size,
-                             CPDF_Dictionary* pDict) {
-    return new CPDF_Stream(pData, size, pDict);
-  }
-
   CPDF_Stream(uint8_t* pData, FX_DWORD size, CPDF_Dictionary* pDict);
 
   CPDF_Dictionary* GetDict() const { return m_pDict; }
 
   void SetData(const uint8_t* pData,
                FX_DWORD size,
                FX_BOOL bCompressed,
                FX_BOOL bKeepBuf);
 
   void InitStream(uint8_t* pData, FX_DWORD size, CPDF_Dictionary* pDict);
 
-  void InitStream(IFX_FileRead* pFile, CPDF_Dictionary* pDict);
+  void InitStreamFromFile(IFX_FileRead* pFile, CPDF_Dictionary* pDict);
 
   FX_BOOL Identical(CPDF_Stream* pOther) const;
 
   FX_DWORD GetRawSize() const { return m_dwSize; }
 
   FX_BOOL ReadRawData(FX_FILESIZE start_pos,
                       uint8_t* pBuf,
                       FX_DWORD buf_size) const;
 
-  FX_BOOL IsMemoryBased() const { return m_GenNum == (FX_DWORD)-1; }
+  FX_BOOL IsMemoryBased() const { return m_GenNum == kMemoryBasedGenNum; }
 
  protected:
+  friend class CPDF_Object;
+  friend class CPDF_StreamAcc;
+
+  static const FX_DWORD kMemoryBasedGenNum = (FX_DWORD)-1;
   ~CPDF_Stream();
 
+  void InitStreamInternal(CPDF_Dictionary* pDict);
+
   CPDF_Dictionary* m_pDict;
 
   FX_DWORD m_dwSize;
 
   FX_DWORD m_GenNum;
 
   union {
     uint8_t* m_pDataBuf;
 
     IFX_FileRead* m_pFile;
   };
-
-  FX_FILESIZE m_FileOffset;
-
-  CPDF_CryptoHandler* m_pCryptoHandler;
-
-  void InitStream(CPDF_Dictionary* pDict);
-  friend class CPDF_Object;
-  friend class CPDF_StreamAcc;
-  friend class CPDF_AttachmentAcc;
 };
 inline CPDF_Stream* ToStream(CPDF_Object* obj) {
   return obj ? obj->AsStream() : nullptr;
 }
 inline const CPDF_Stream* ToStream(const CPDF_Object* obj) {
   return obj ? obj->AsStream() : nullptr;
 }
 
 class CPDF_StreamAcc {
  public:
   CPDF_StreamAcc();
 
   ~CPDF_StreamAcc();
 
   void LoadAllData(const CPDF_Stream* pStream,
                    FX_BOOL bRawAccess = FALSE,
                    FX_DWORD estimated_size = 0,
                    FX_BOOL bImageAcc = FALSE);
 
   const CPDF_Stream* GetStream() const { return m_pStream; }
 
   CPDF_Dictionary* GetDict() const {
-    return m_pStream ? m_pStream->GetDict() : NULL;
+    return m_pStream ? m_pStream->GetDict() : nullptr;
   }
 
   const uint8_t* GetData() const;
 
   FX_DWORD GetSize() const;
 
   uint8_t* DetachData();
 
   const CFX_ByteString& GetImageDecoder() { return m_ImageDecoder; }
 
@@ skipping 80 matching lines @@
 
  protected:
   CFX_MapPtrToPtr m_IndirectObjs;
 
   CPDF_Parser* m_pParser;
 
   FX_DWORD m_LastObjNum;
 };
 
 #endif  // CORE_INCLUDE_FPDFAPI_FPDF_OBJECTS_H_