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

fpdfsdk/include/javascript/IJavaScript.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 FPDFSDK_INCLUDE_JAVASCRIPT_IJAVASCRIPT_H_
 #define FPDFSDK_INCLUDE_JAVASCRIPT_IJAVASCRIPT_H_
 
 #include "../../../core/include/fxcrt/fx_string.h"
 #include "../../../core/include/fxcrt/fx_system.h"
 #include "../../../xfa/include/fxjse/fxjse.h"
 
 class CPDF_Bookmark;
 class CPDF_FormField;
 class CPDFSDK_Annot;
 class CPDFSDK_Document;
 
 class IFXJS_Context {
  public:
-  virtual ~IFXJS_Context() {}
   virtual FX_BOOL Compile(const CFX_WideString& script,
                           CFX_WideString& info) = 0;
   virtual FX_BOOL RunScript(const CFX_WideString& script,
                             CFX_WideString& info) = 0;
 
   virtual void OnApp_Init() = 0;
 
   virtual void OnDoc_Open(CPDFSDK_Document* pDoc,
                           const CFX_WideString& strTargetName) = 0;
   virtual void OnDoc_WillPrint(CPDFSDK_Document* pDoc) = 0;
@@ skipping 90 matching lines @@
   virtual void OnBookmark_MouseUp(CPDF_Bookmark* pBookMark) = 0;
   virtual void OnLink_MouseUp(CPDFSDK_Document* pTarget) = 0;
 
   virtual void OnMenu_Exec(CPDFSDK_Document* pTarget,
                            const CFX_WideString&) = 0;
   virtual void OnBatchExec(CPDFSDK_Document* pTarget) = 0;
   virtual void OnConsole_Exec() = 0;
   virtual void OnExternal_Exec() = 0;
 
   virtual void EnableMessageBox(FX_BOOL bEnable) = 0;
+
+ protected:
+  virtual ~IFXJS_Context() {}
 };
 
 class IFXJS_Runtime {
  public:
   virtual IFXJS_Context* NewContext() = 0;
   virtual void ReleaseContext(IFXJS_Context* pContext) = 0;
   virtual IFXJS_Context* GetCurrentContext() = 0;
 
   virtual void SetReaderDocument(CPDFSDK_Document* pReaderDoc) = 0;
 
   virtual CPDFSDK_Document* GetReaderDocument() = 0;
 
   virtual FX_BOOL GetHValueByName(const CFX_ByteStringC& utf8Name,
                                   FXJSE_HVALUE hValue) = 0;
   virtual FX_BOOL SetHValueByName(const CFX_ByteStringC& utf8Name,
                                   FXJSE_HVALUE hValue) = 0;
 
  protected:
-  ~IFXJS_Runtime() {}
+  virtual ~IFXJS_Runtime() {}
 };
 
 class CPDFDoc_Environment;
 class CJS_GlobalData;
 
 class CJS_RuntimeFactory {
  public:
   CJS_RuntimeFactory()
       : m_bInit(FALSE), m_nRef(0), m_pGlobalData(NULL), m_nGlobalDataCount(0) {}
   ~CJS_RuntimeFactory();
   IFXJS_Runtime* NewJSRuntime(CPDFDoc_Environment* pApp);
   void DeleteJSRuntime(IFXJS_Runtime* pRuntime);
   void AddRef();
   void Release();
 
   CJS_GlobalData* NewGlobalData(CPDFDoc_Environment* pApp);
   void ReleaseGlobalData();
 
  private:
   FX_BOOL m_bInit;
   int m_nRef;
   CJS_GlobalData* m_pGlobalData;
   int32_t m_nGlobalDataCount;
 };
 
 #endif  // FPDFSDK_INCLUDE_JAVASCRIPT_IJAVASCRIPT_H_