Use override in more classes in fpdfsdk/

R=tsepez@chromium.org

Review URL: https://codereview.chromium.org/1287193005 .

1 files changed, 103 insertions, 113 deletions

diff --git a/fpdfsdk/include/javascript/JS_Context.h b/fpdfsdk/include/javascript/JS_Context.h
index f61f37cdc6..a716bc2ccb 100644
--- a/fpdfsdk/include/javascript/JS_Context.h
+++ b/fpdfsdk/include/javascript/JS_Context.h
@@ -17,121 +17,112 @@ class CJS_Runtime;
 class CJS_Context : public IFXJS_Context {
  public:
   CJS_Context(CJS_Runtime* pRuntime);
-  virtual ~CJS_Context();
+  ~CJS_Context() override;
+
+  // IFXJS_Context
+  FX_BOOL Compile(const CFX_WideString& script, CFX_WideString& info) override;
+  FX_BOOL RunScript(const CFX_WideString& script,
+                    CFX_WideString& info) override;
+  void OnApp_Init() override;
+  void OnDoc_Open(CPDFSDK_Document* pDoc,
+                  const CFX_WideString& strTargetName) override;
+  void OnDoc_WillPrint(CPDFSDK_Document* pDoc) override;
+  void OnDoc_DidPrint(CPDFSDK_Document* pDoc) override;
+  void OnDoc_WillSave(CPDFSDK_Document* pDoc) override;
+  void OnDoc_DidSave(CPDFSDK_Document* pDoc) override;
+  void OnDoc_WillClose(CPDFSDK_Document* pDoc) override;
+  void OnPage_Open(CPDFSDK_Document* pTarget) override;
+  void OnPage_Close(CPDFSDK_Document* pTarget) override;
+  void OnPage_InView(CPDFSDK_Document* pTarget) override;
+  void OnPage_OutView(CPDFSDK_Document* pTarget) override;
+  void OnField_MouseDown(FX_BOOL bModifier,
+                         FX_BOOL bShift,
+                         CPDF_FormField* pTarget) override;
+  void OnField_MouseEnter(FX_BOOL bModifier,
+                          FX_BOOL bShift,
+                          CPDF_FormField* pTarget) override;
+  void OnField_MouseExit(FX_BOOL bModifier,
+                         FX_BOOL bShift,
+                         CPDF_FormField* pTarget) override;
+  void OnField_MouseUp(FX_BOOL bModifier,
+                       FX_BOOL bShift,
+                       CPDF_FormField* pTarget) override;
+  void OnField_Focus(FX_BOOL bModifier,
+                     FX_BOOL bShift,
+                     CPDF_FormField* pTarget,
+                     const CFX_WideString& Value) override;
+  void OnField_Blur(FX_BOOL bModifier,
+                    FX_BOOL bShift,
+                    CPDF_FormField* pTarget,
+                    const CFX_WideString& Value) override;
+  void OnField_Calculate(CPDF_FormField* pSource,
+                         CPDF_FormField* pTarget,
+                         CFX_WideString& Value,
+                         FX_BOOL& bRc) override;
+  void OnField_Format(CPDF_FormField* pTarget,
+                      CFX_WideString& Value,
+                      FX_BOOL bWillCommit) override;
+  void OnField_Keystroke(CFX_WideString& strChange,
+                         const CFX_WideString& strChangeEx,
+                         FX_BOOL bKeyDown,
+                         FX_BOOL bModifier,
+                         int& nSelEnd,
+                         int& nSelStart,
+                         FX_BOOL bShift,
+                         CPDF_FormField* pTarget,
+                         CFX_WideString& Value,
+                         FX_BOOL bWillCommit,
+                         FX_BOOL bFieldFull,
+                         FX_BOOL& bRc) override;
+  void OnField_Validate(CFX_WideString& strChange,
+                        const CFX_WideString& strChangeEx,
+                        FX_BOOL bKeyDown,
+                        FX_BOOL bModifier,
+                        FX_BOOL bShift,
+                        CPDF_FormField* pTarget,
+                        CFX_WideString& Value,
+                        FX_BOOL& bRc) override;
+  void OnScreen_Focus(FX_BOOL bModifier,
+                      FX_BOOL bShift,
+                      CPDFSDK_Annot* pScreen) override;
+  void OnScreen_Blur(FX_BOOL bModifier,
+                     FX_BOOL bShift,
+                     CPDFSDK_Annot* pScreen) override;
+  void OnScreen_Open(FX_BOOL bModifier,
+                     FX_BOOL bShift,
+                     CPDFSDK_Annot* pScreen) override;
+  void OnScreen_Close(FX_BOOL bModifier,
+                      FX_BOOL bShift,
+                      CPDFSDK_Annot* pScreen) override;
+  void OnScreen_MouseDown(FX_BOOL bModifier,
+                          FX_BOOL bShift,
+                          CPDFSDK_Annot* pScreen) override;
+  void OnScreen_MouseUp(FX_BOOL bModifier,
+                        FX_BOOL bShift,
+                        CPDFSDK_Annot* pScreen) override;
+  void OnScreen_MouseEnter(FX_BOOL bModifier,
+                           FX_BOOL bShift,
+                           CPDFSDK_Annot* pScreen) override;
+  void OnScreen_MouseExit(FX_BOOL bModifier,
+                          FX_BOOL bShift,
+                          CPDFSDK_Annot* pScreen) override;
+  void OnScreen_InView(FX_BOOL bModifier,
+                       FX_BOOL bShift,
+                       CPDFSDK_Annot* pScreen) override;
+  void OnScreen_OutView(FX_BOOL bModifier,
+                        FX_BOOL bShift,
+                        CPDFSDK_Annot* pScreen) override;
+  void OnBookmark_MouseUp(CPDF_Bookmark* pBookMark) override;
+  void OnLink_MouseUp(CPDFSDK_Document* pTarget) override;
+  void OnMenu_Exec(CPDFSDK_Document* pTarget,
+                   const CFX_WideString& strTargetName) override;
+  void OnBatchExec(CPDFSDK_Document* pTarget) override;
+  void OnConsole_Exec() override;
+  void OnExternal_Exec() override;
+  void EnableMessageBox(FX_BOOL bEnable) override { m_bMsgBoxEnable = bEnable; }
 
- public:
-  virtual FX_BOOL Compile(const CFX_WideString& script, CFX_WideString& info);
-  virtual FX_BOOL RunScript(const CFX_WideString& script, CFX_WideString& info);
-
- public:
-  virtual void OnApp_Init();
-
-  virtual void OnDoc_Open(CPDFSDK_Document* pDoc,
-                          const CFX_WideString& strTargetName);
-  virtual void OnDoc_WillPrint(CPDFSDK_Document* pDoc);
-  virtual void OnDoc_DidPrint(CPDFSDK_Document* pDoc);
-  virtual void OnDoc_WillSave(CPDFSDK_Document* pDoc);
-  virtual void OnDoc_DidSave(CPDFSDK_Document* pDoc);
-  virtual void OnDoc_WillClose(CPDFSDK_Document* pDoc);
-
-  virtual void OnPage_Open(CPDFSDK_Document* pTarget);
-  virtual void OnPage_Close(CPDFSDK_Document* pTarget);
-  virtual void OnPage_InView(CPDFSDK_Document* pTarget);
-  virtual void OnPage_OutView(CPDFSDK_Document* pTarget);
-
-  virtual void OnField_MouseDown(FX_BOOL bModifier,
-                                 FX_BOOL bShift,
-                                 CPDF_FormField* pTarget);
-  virtual void OnField_MouseEnter(FX_BOOL bModifier,
-                                  FX_BOOL bShift,
-                                  CPDF_FormField* pTarget);
-  virtual void OnField_MouseExit(FX_BOOL bModifier,
-                                 FX_BOOL bShift,
-                                 CPDF_FormField* pTarget);
-  virtual void OnField_MouseUp(FX_BOOL bModifier,
-                               FX_BOOL bShift,
-                               CPDF_FormField* pTarget);
-  virtual void OnField_Focus(FX_BOOL bModifier,
-                             FX_BOOL bShift,
-                             CPDF_FormField* pTarget,
-                             const CFX_WideString& Value);
-  virtual void OnField_Blur(FX_BOOL bModifier,
-                            FX_BOOL bShift,
-                            CPDF_FormField* pTarget,
-                            const CFX_WideString& Value);
-
-  virtual void OnField_Calculate(CPDF_FormField* pSource,
-                                 CPDF_FormField* pTarget,
-                                 CFX_WideString& Value,
-                                 FX_BOOL& bRc);
-  virtual void OnField_Format(CPDF_FormField* pTarget,
-                              CFX_WideString& Value,
-                              FX_BOOL bWillCommit);
-  virtual void OnField_Keystroke(CFX_WideString& strChange,
-                                 const CFX_WideString& strChangeEx,
-                                 FX_BOOL bKeyDown,
-                                 FX_BOOL bModifier,
-                                 int& nSelEnd,
-                                 int& nSelStart,
-                                 FX_BOOL bShift,
-                                 CPDF_FormField* pTarget,
-                                 CFX_WideString& Value,
-                                 FX_BOOL bWillCommit,
-                                 FX_BOOL bFieldFull,
-                                 FX_BOOL& bRc);
-  virtual void OnField_Validate(CFX_WideString& strChange,
-                                const CFX_WideString& strChangeEx,
-                                FX_BOOL bKeyDown,
-                                FX_BOOL bModifier,
-                                FX_BOOL bShift,
-                                CPDF_FormField* pTarget,
-                                CFX_WideString& Value,
-                                FX_BOOL& bRc);
-
-  virtual void OnScreen_Focus(FX_BOOL bModifier,
-                              FX_BOOL bShift,
-                              CPDFSDK_Annot* pScreen);
-  virtual void OnScreen_Blur(FX_BOOL bModifier,
-                             FX_BOOL bShift,
-                             CPDFSDK_Annot* pScreen);
-  virtual void OnScreen_Open(FX_BOOL bModifier,
-                             FX_BOOL bShift,
-                             CPDFSDK_Annot* pScreen);
-  virtual void OnScreen_Close(FX_BOOL bModifier,
-                              FX_BOOL bShift,
-                              CPDFSDK_Annot* pScreen);
-  virtual void OnScreen_MouseDown(FX_BOOL bModifier,
-                                  FX_BOOL bShift,
-                                  CPDFSDK_Annot* pScreen);
-  virtual void OnScreen_MouseUp(FX_BOOL bModifier,
-                                FX_BOOL bShift,
-                                CPDFSDK_Annot* pScreen);
-  virtual void OnScreen_MouseEnter(FX_BOOL bModifier,
-                                   FX_BOOL bShift,
-                                   CPDFSDK_Annot* pScreen);
-  virtual void OnScreen_MouseExit(FX_BOOL bModifier,
-                                  FX_BOOL bShift,
-                                  CPDFSDK_Annot* pScreen);
-  virtual void OnScreen_InView(FX_BOOL bModifier,
-                               FX_BOOL bShift,
-                               CPDFSDK_Annot* pScreen);
-  virtual void OnScreen_OutView(FX_BOOL bModifier,
-                                FX_BOOL bShift,
-                                CPDFSDK_Annot* pScreen);
-
-  virtual void OnBookmark_MouseUp(CPDF_Bookmark* pBookMark);
-  virtual void OnLink_MouseUp(CPDFSDK_Document* pTarget);
-
-  virtual void OnMenu_Exec(CPDFSDK_Document* pTarget,
-                           const CFX_WideString& strTargetName);
-  virtual void OnBatchExec(CPDFSDK_Document* pTarget);
-  virtual void OnConsole_Exec();
-  virtual void OnExternal_Exec();
-
-  virtual void EnableMessageBox(FX_BOOL bEnable) { m_bMsgBoxEnable = bEnable; }
   FX_BOOL IsMsgBoxEnabled() const { return m_bMsgBoxEnable; }
 
- public:
   CPDFDoc_Environment* GetReaderApp();
   CJS_Runtime* GetJSRuntime() { return m_pRuntime; }
 
@@ -143,7 +134,6 @@ class CJS_Context : public IFXJS_Context {
  private:
   CJS_Runtime* m_pRuntime;
   CJS_EventHandler* m_pEventHandler;
-
   FX_BOOL m_bBusy;
   FX_BOOL m_bMsgBoxEnable;
 };