Remove Release() from IFXCRT_FileAccess

core/fxcrt/extension.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_FXCRT_EXTENSION_H_
 #define CORE_FXCRT_EXTENSION_H_
 
 #include <algorithm>
+#include <memory>
 
 #include "core/fxcrt/include/fx_basic.h"
 #include "core/fxcrt/include/fx_safe_types.h"
 
 class IFXCRT_FileAccess {
  public:
+  static IFXCRT_FileAccess* Create();
   virtual ~IFXCRT_FileAccess() {}
+
   virtual FX_BOOL Open(const CFX_ByteStringC& fileName, uint32_t dwMode) = 0;
   virtual FX_BOOL Open(const CFX_WideStringC& fileName, uint32_t dwMode) = 0;
   virtual void Close() = 0;
-  virtual void Release() = 0;
   virtual FX_FILESIZE GetSize() const = 0;
   virtual FX_FILESIZE GetPosition() const = 0;
   virtual FX_FILESIZE SetPosition(FX_FILESIZE pos) = 0;
   virtual size_t Read(void* pBuffer, size_t szBuffer) = 0;
   virtual size_t Write(const void* pBuffer, size_t szBuffer) = 0;
   virtual size_t ReadPos(void* pBuffer, size_t szBuffer, FX_FILESIZE pos) = 0;
   virtual size_t WritePos(const void* pBuffer,
                           size_t szBuffer,
                           FX_FILESIZE pos) = 0;
   virtual FX_BOOL Flush() = 0;
   virtual FX_BOOL Truncate(FX_FILESIZE szFile) = 0;
 };
-IFXCRT_FileAccess* FXCRT_FileAccess_Create();
 
 #ifdef PDF_ENABLE_XFA
 class CFX_CRTFileAccess : public IFX_FileAccess {
  public:
   CFX_CRTFileAccess() : m_RefCount(0) {}
 
   // IFX_FileAccess
   void Release() override {
     if (--m_RefCount == 0)
       delete this;
@@ skipping 17 matching lines @@
   }
 
  protected:
   CFX_WideString m_path;
   uint32_t m_RefCount;
 };
 #endif  // PDF_ENABLE_XFA
 
 class CFX_CRTFileStream final : public IFX_FileStream {
  public:
-  explicit CFX_CRTFileStream(IFXCRT_FileAccess* pFA);
+  explicit CFX_CRTFileStream(std::unique_ptr<IFXCRT_FileAccess> pFA);
   ~CFX_CRTFileStream() override;
 
   // IFX_FileStream:
   IFX_FileStream* Retain() override;
   void Release() override;
   FX_FILESIZE GetSize() override;
   FX_BOOL IsEOF() override;
   FX_FILESIZE GetPosition() override;
   FX_BOOL ReadBlock(void* buffer, FX_FILESIZE offset, size_t size) override;
   size_t ReadBlock(void* buffer, size_t size) override;
   FX_BOOL WriteBlock(const void* buffer,
                      FX_FILESIZE offset,
                      size_t size) override;
   FX_BOOL Flush() override;
 
  protected:
-  IFXCRT_FileAccess* m_pFile;
+  std::unique_ptr<IFXCRT_FileAccess> m_pFile;
   uint32_t m_dwCount;
 };
 
 #define FX_MEMSTREAM_BlockSize (64 * 1024)
 #define FX_MEMSTREAM_Consecutive 0x01
 #define FX_MEMSTREAM_TakeOver 0x02
 class CFX_MemoryStream final : public IFX_MemoryStream {
  public:
   explicit CFX_MemoryStream(FX_BOOL bConsecutive)
       : m_dwCount(1),
@@ skipping 225 matching lines @@
   uint32_t mt[MT_N];
 };
 #if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
 FX_BOOL FX_GenerateCryptoRandom(uint32_t* pBuffer, int32_t iCount);
 #endif
 #ifdef __cplusplus
 }
 #endif
 
 #endif  // CORE_FXCRT_EXTENSION_H_