Merge to XFA: Fix a bad virtual keyword removal from commit 0f6b51c.

BUG=546744
TBR=tsepez@chromium.org

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

(cherry picked from commit ae58ed8bccc56dd78c12d89972b19d58de94f790)

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

2 files changed, 15 insertions, 21 deletions

diff --git a/fpdfsdk/include/formfiller/FFL_CBA_Fontmap.h b/fpdfsdk/include/formfiller/FFL_CBA_Fontmap.h
index 0215b868dd..c3e2e99646 100644
--- a/fpdfsdk/include/formfiller/FFL_CBA_Fontmap.h
+++ b/fpdfsdk/include/formfiller/FFL_CBA_Fontmap.h
@@ -15,39 +15,31 @@ class CPDFSDK_Annot;
 class CBA_FontMap : public CPWL_FontMap {
  public:
   CBA_FontMap(CPDFSDK_Annot* pAnnot, IFX_SystemHandler* pSystemHandler);
-  CBA_FontMap(CPDF_Document* pDocument,
-              CPDF_Dictionary* pAnnotDict,
-              IFX_SystemHandler* pSystemHandler);
-
   ~CBA_FontMap() override;
 
-  virtual void Initial(const FX_CHAR* fontname = NULL);
-
- public:
   void SetDefaultFont(CPDF_Font* pFont, const CFX_ByteString& sFontName);
 
   void Reset();
   void SetAPType(const CFX_ByteString& sAPType);
 
- protected:
-  virtual CPDF_Font* FindFontSameCharset(CFX_ByteString& sFontAlias,
-                                         int32_t nCharset);
-  virtual void AddedFont(CPDF_Font* pFont, const CFX_ByteString& sFontAlias);
-  virtual CPDF_Document* GetDocument();
-
  private:
+  // CPWL_FontMap:
+  void Initialize() override;
+  CPDF_Document* GetDocument() override;
+  CPDF_Font* FindFontSameCharset(CFX_ByteString& sFontAlias,
+                                 int32_t nCharset) override;
+  void AddedFont(CPDF_Font* pFont, const CFX_ByteString& sFontAlias) override;
+
   CPDF_Font* FindResFontSameCharset(CPDF_Dictionary* pResDict,
                                     CFX_ByteString& sFontAlias,
                                     int32_t nCharset);
   CPDF_Font* GetAnnotDefaultFont(CFX_ByteString& csNameTag);
   void AddFontToAnnotDict(CPDF_Font* pFont, const CFX_ByteString& sAlias);
 
- private:
   CPDF_Document* m_pDocument;
   CPDF_Dictionary* m_pAnnotDict;
   CPDF_Font* m_pDefaultFont;
   CFX_ByteString m_sDefaultFontName;
-
   CFX_ByteString m_sAPType;
 };
 
diff --git a/fpdfsdk/include/pdfwindow/PWL_FontMap.h b/fpdfsdk/include/pdfwindow/PWL_FontMap.h
index c17483439c..c8c8722c11 100644
--- a/fpdfsdk/include/pdfwindow/PWL_FontMap.h
+++ b/fpdfsdk/include/pdfwindow/PWL_FontMap.h
@@ -80,10 +80,11 @@ class CPWL_FontMap : public IFX_Edit_FontMap {
                            uint8_t nCharset);
 
  protected:
-  void Initial(const FX_CHAR* fontname = NULL);
-  CPDF_Document* GetDocument();
-  CPDF_Font* FindFontSameCharset(CFX_ByteString& sFontAlias, int32_t nCharset);
-  void AddedFont(CPDF_Font* pFont, const CFX_ByteString& sFontAlias);
+  virtual void Initialize();
+  virtual CPDF_Document* GetDocument();
+  virtual CPDF_Font* FindFontSameCharset(CFX_ByteString& sFontAlias,
+                                         int32_t nCharset);
+  virtual void AddedFont(CPDF_Font* pFont, const CFX_ByteString& sFontAlias);
 
   FX_BOOL KnowWord(int32_t nFontIndex, FX_WORD word);
 
@@ -126,9 +127,10 @@ class CPWL_DocFontMap : public CPWL_FontMap {
                   CPDF_Document* pAttachedDoc);
   ~CPWL_DocFontMap() override;
 
-  virtual CPDF_Document* GetDocument();
-
  private:
+  // CPWL_FontMap:
+  CPDF_Document* GetDocument() override;
+
   CPDF_Document* m_pAttachedDoc;
 };