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

core/include/fpdfapi/fpdf_parser.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_PARSER_H_
 #define CORE_INCLUDE_FPDFAPI_FPDF_PARSER_H_
 
 #include "../fxcrt/fx_system.h"
@@ skipping 529 matching lines @@
   virtual FX_BOOL IsMetadataEncrypted() { return TRUE; }
 
   virtual CPDF_CryptoHandler* CreateCryptoHandler() = 0;
 
   virtual CPDF_StandardSecurityHandler* GetStandardHandler() { return NULL; }
 };
 #define PDF_ENCRYPT_CONTENT 0
 class CPDF_StandardSecurityHandler : public CPDF_SecurityHandler {
  public:
   CPDF_StandardSecurityHandler();
+  ~CPDF_StandardSecurityHandler() override;
 
-  virtual ~CPDF_StandardSecurityHandler();
-  virtual FX_BOOL OnInit(CPDF_Parser* pParser, CPDF_Dictionary* pEncryptDict);
-  virtual FX_DWORD GetPermissions();
-  virtual FX_BOOL IsOwner() { return m_bOwner; }
-  virtual FX_BOOL GetCryptInfo(int& cipher,
-                               const uint8_t*& buffer,
-                               int& keylen);
-  virtual FX_BOOL IsMetadataEncrypted();
-  virtual CPDF_CryptoHandler* CreateCryptoHandler();
-  virtual CPDF_StandardSecurityHandler* GetStandardHandler() { return this; }
+  // CPDF_SecurityHandler
+  FX_BOOL OnInit(CPDF_Parser* pParser, CPDF_Dictionary* pEncryptDict) override;
+  FX_DWORD GetPermissions() override;
+  FX_BOOL IsOwner() override { return m_bOwner; }
+  FX_BOOL GetCryptInfo(int& cipher,
+                       const uint8_t*& buffer,
+                       int& keylen) override;
+  FX_BOOL IsMetadataEncrypted() override;
+  CPDF_CryptoHandler* CreateCryptoHandler() override;
+  CPDF_StandardSecurityHandler* GetStandardHandler() override { return this; }
 
   void OnCreate(CPDF_Dictionary* pEncryptDict,
                 CPDF_Array* pIdArray,
                 const uint8_t* user_pass,
                 FX_DWORD user_size,
                 const uint8_t* owner_pass,
                 FX_DWORD owner_size,
                 FX_DWORD type = PDF_ENCRYPT_CONTENT);
 
   void OnCreate(CPDF_Dictionary* pEncryptDict,
@@ skipping 105 matching lines @@
                                  const uint8_t* src_buf,
                                  FX_DWORD src_size,
                                  uint8_t* dest_buf,
                                  FX_DWORD& dest_size) = 0;
 
   void Decrypt(FX_DWORD objnum, FX_DWORD version, CFX_ByteString& str);
 };
 class CPDF_StandardCryptoHandler : public CPDF_CryptoHandler {
  public:
   CPDF_StandardCryptoHandler();
+  ~CPDF_StandardCryptoHandler() override;
 
-  virtual ~CPDF_StandardCryptoHandler();
+  // CPDF_CryptoHandler
+  FX_BOOL Init(CPDF_Dictionary* pEncryptDict,
+               CPDF_SecurityHandler* pSecurityHandler) override;
+  FX_DWORD DecryptGetSize(FX_DWORD src_size) override;
+  void* DecryptStart(FX_DWORD objnum, FX_DWORD gennum) override;
+  FX_BOOL DecryptStream(void* context,
+                        const uint8_t* src_buf,
+                        FX_DWORD src_size,
+                        CFX_BinaryBuf& dest_buf) override;
+  FX_BOOL DecryptFinish(void* context, CFX_BinaryBuf& dest_buf) override;
+  FX_DWORD EncryptGetSize(FX_DWORD objnum,
+                          FX_DWORD version,
+                          const uint8_t* src_buf,
+                          FX_DWORD src_size) override;
+  FX_BOOL EncryptContent(FX_DWORD objnum,
+                         FX_DWORD version,
+                         const uint8_t* src_buf,
+                         FX_DWORD src_size,
+                         uint8_t* dest_buf,
+                         FX_DWORD& dest_size) override;
 
   FX_BOOL Init(int cipher, const uint8_t* key, int keylen);
-  virtual FX_BOOL Init(CPDF_Dictionary* pEncryptDict,
-                       CPDF_SecurityHandler* pSecurityHandler);
-  virtual FX_DWORD DecryptGetSize(FX_DWORD src_size);
-  virtual void* DecryptStart(FX_DWORD objnum, FX_DWORD gennum);
-  virtual FX_BOOL DecryptStream(void* context,
-                                const uint8_t* src_buf,
-                                FX_DWORD src_size,
-                                CFX_BinaryBuf& dest_buf);
-  virtual FX_BOOL DecryptFinish(void* context, CFX_BinaryBuf& dest_buf);
-  virtual FX_DWORD EncryptGetSize(FX_DWORD objnum,
-                                  FX_DWORD version,
-                                  const uint8_t* src_buf,
-                                  FX_DWORD src_size);
-  virtual FX_BOOL EncryptContent(FX_DWORD objnum,
-                                 FX_DWORD version,
-                                 const uint8_t* src_buf,
-                                 FX_DWORD src_size,
-                                 uint8_t* dest_buf,
-                                 FX_DWORD& dest_size);
 
  protected:
   virtual void CryptBlock(FX_BOOL bEncrypt,
                           FX_DWORD objnum,
                           FX_DWORD gennum,
                           const uint8_t* src_buf,
                           FX_DWORD src_size,
                           uint8_t* dest_buf,
                           FX_DWORD& dest_size);
   virtual void* CryptStart(FX_DWORD objnum, FX_DWORD gennum, FX_BOOL bEncrypt);
@@ skipping 184 matching lines @@
   PDF_DATAAVAIL_PAGE,
   PDF_DATAAVAIL_PAGE_LATERLOAD,
   PDF_DATAAVAIL_RESOURCES,
   PDF_DATAAVAIL_DONE,
   PDF_DATAAVAIL_ERROR,
   PDF_DATAAVAIL_LOADALLFILE,
   PDF_DATAAVAIL_TRAILER_APPEND
 };
 
 #endif  // CORE_INCLUDE_FPDFAPI_FPDF_PARSER_H_