Merge to XFA: Use override in more classes in core/

core/src/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_SRC_FXCRT_EXTENSION_H_
 #define CORE_SRC_FXCRT_EXTENSION_H_
 
 #include "../../include/fxcrt/fx_basic.h"
@@ skipping 12 matching lines @@
   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();
+
 class CFX_CRTFileAccess : public IFX_FileAccess {

[Lei Zhang, 2015/08/15 04:49:07]

This is new in XFA.

  public:
   CFX_CRTFileAccess() : m_RefCount(0) {}
 
-  virtual void Release() {
+  // IFX_FileAccess
+  void Release() override {
     if (--m_RefCount == 0)
       delete this;
   }
 
-  IFX_FileAccess* Retain() {
+  IFX_FileAccess* Retain() override {
     m_RefCount++;
     return (IFX_FileAccess*)this;
   }
 
-  virtual FX_BOOL Init(const CFX_WideStringC& wsPath) {
+  void GetPath(CFX_WideString& wsPath) override { wsPath = m_path; }
+
+  IFX_FileStream* CreateFileStream(FX_DWORD dwModes) override {
+    return FX_CreateFileStream(m_path, dwModes);
+  }
+
+  FX_BOOL Init(const CFX_WideStringC& wsPath) {
     m_path = wsPath;
     m_RefCount = 1;
     return TRUE;
   }
 
-  virtual void GetPath(CFX_WideString& wsPath) { wsPath = m_path; }
-
-  virtual IFX_FileStream* CreateFileStream(FX_DWORD dwModes) {
-    return FX_CreateFileStream(m_path, dwModes);
-  }
-
  protected:
   CFX_WideString m_path;
   FX_DWORD m_RefCount;
 };
+
 class CFX_CRTFileStream final : public IFX_FileStream {
  public:
   CFX_CRTFileStream(IFXCRT_FileAccess* pFA) : m_pFile(pFA), m_dwCount(1) {}
-  ~CFX_CRTFileStream() {
+  ~CFX_CRTFileStream() override {
     if (m_pFile) {
       m_pFile->Release();
     }
   }
   virtual IFX_FileStream* Retain() override {
     m_dwCount++;
     return this;
   }
   virtual void Release() override {
     FX_DWORD nCount = --m_dwCount;
@@ skipping 16 matching lines @@
                              FX_FILESIZE offset,
                              size_t size) override {
     return (FX_BOOL)m_pFile->WritePos(buffer, size, offset);
   }
   virtual FX_BOOL Flush() override { return m_pFile->Flush(); }
 
  protected:
   IFXCRT_FileAccess* m_pFile;
   FX_DWORD 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:
   CFX_MemoryStream(FX_BOOL bConsecutive)
       : m_dwCount(1),
         m_nTotalSize(0),
         m_nCurSize(0),
         m_nCurPos(0),
         m_nGrowSize(FX_MEMSTREAM_BlockSize) {
     m_dwFlags =
         FX_MEMSTREAM_TakeOver | (bConsecutive ? FX_MEMSTREAM_Consecutive : 0);
   }
   CFX_MemoryStream(uint8_t* pBuffer, size_t nSize, FX_BOOL bTakeOver)
       : m_dwCount(1),
         m_nTotalSize(nSize),
         m_nCurSize(nSize),
         m_nCurPos(0),
         m_nGrowSize(FX_MEMSTREAM_BlockSize) {
     m_Blocks.Add(pBuffer);
     m_dwFlags =
         FX_MEMSTREAM_Consecutive | (bTakeOver ? FX_MEMSTREAM_TakeOver : 0);
   }
-  ~CFX_MemoryStream() {
+  ~CFX_MemoryStream() override {
     if (m_dwFlags & FX_MEMSTREAM_TakeOver) {
       for (int32_t i = 0; i < m_Blocks.GetSize(); i++) {
         FX_Free((uint8_t*)m_Blocks[i]);
       }
     }
     m_Blocks.RemoveAll();
   }
   virtual IFX_FileStream* Retain() override {
     m_dwCount++;
     return this;
@@ skipping 172 matching lines @@
     size = (size - m_nTotalSize + m_nGrowSize - 1) / m_nGrowSize;
     m_Blocks.SetSize(m_Blocks.GetSize() + (int32_t)size);
     while (size--) {
       uint8_t* pBlock = FX_Alloc(uint8_t, m_nGrowSize);
       m_Blocks.SetAt(iCount++, pBlock);
       m_nTotalSize += m_nGrowSize;
     }
     return TRUE;
   }
 };
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 #define MT_N 848
 #define MT_M 456
 #define MT_Matrix_A 0x9908b0df
 #define MT_Upper_Mask 0x80000000
 #define MT_Lower_Mask 0x7fffffff
 typedef struct _FX_MTRANDOMCONTEXT {
   _FX_MTRANDOMCONTEXT() {
     mti = MT_N + 1;
     bHaveSeed = FALSE;
   }
   FX_DWORD mti;
   FX_BOOL bHaveSeed;
   FX_DWORD mt[MT_N];
 } FX_MTRANDOMCONTEXT, *FX_LPMTRANDOMCONTEXT;
 typedef FX_MTRANDOMCONTEXT const* FX_LPCMTRANDOMCONTEXT;
 #if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
 FX_BOOL FX_GenerateCryptoRandom(FX_DWORD* pBuffer, int32_t iCount);
 #endif
 #ifdef __cplusplus
 }
 #endif
 
 #endif  // CORE_SRC_FXCRT_EXTENSION_H_