Merge to XFA: Cleanup CFX_UnicodeEncoding and remove IFX_FontEncoding.

core/include/fxge/fx_font.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_FXGE_FX_FONT_H_
 #define CORE_INCLUDE_FXGE_FX_FONT_H_
 
 #include <map>
@@ skipping 122 matching lines @@
 
  protected:
   FX_BOOL m_bEmbedded;
   FX_BOOL m_bVertical;
   FX_BOOL m_bLogic;
   void* m_pOwnedStream;
 };
 #define ENCODING_INTERNAL 0
 #define ENCODING_UNICODE 1
 
-class IFX_FontEncoding {
- public:
-  virtual ~IFX_FontEncoding() {}
-
-  virtual FX_DWORD GlyphFromCharCode(FX_DWORD charcode) = 0;
-
-  virtual CFX_WideString UnicodeFromCharCode(FX_DWORD charcode) const = 0;
-
-  virtual FX_DWORD CharCodeFromUnicode(FX_WCHAR Unicode) const = 0;
-};
-
-IFX_FontEncoding* FXGE_CreateUnicodeEncoding(CFX_Font* pFont);
 #define FXFM_ENC_TAG(a, b, c, d)                                          \
   (((FX_DWORD)(a) << 24) | ((FX_DWORD)(b) << 16) | ((FX_DWORD)(c) << 8) | \
    (FX_DWORD)(d))
 #define FXFM_ENCODING_NONE FXFM_ENC_TAG(0, 0, 0, 0)
 #define FXFM_ENCODING_MS_SYMBOL FXFM_ENC_TAG('s', 'y', 'm', 'b')
 #define FXFM_ENCODING_UNICODE FXFM_ENC_TAG('u', 'n', 'i', 'c')
 #define FXFM_ENCODING_MS_SJIS FXFM_ENC_TAG('s', 'j', 'i', 's')
 #define FXFM_ENCODING_MS_GB2312 FXFM_ENC_TAG('g', 'b', ' ', ' ')
 #define FXFM_ENCODING_MS_BIG5 FXFM_ENC_TAG('b', 'i', 'g', '5')
 #define FXFM_ENCODING_MS_WANSUNG FXFM_ENC_TAG('w', 'a', 'n', 's')
 #define FXFM_ENCODING_MS_JOHAB FXFM_ENC_TAG('j', 'o', 'h', 'a')
 #define FXFM_ENCODING_ADOBE_STANDARD FXFM_ENC_TAG('A', 'D', 'O', 'B')
 #define FXFM_ENCODING_ADOBE_EXPERT FXFM_ENC_TAG('A', 'D', 'B', 'E')
 #define FXFM_ENCODING_ADOBE_CUSTOM FXFM_ENC_TAG('A', 'D', 'B', 'C')
 #define FXFM_ENCODING_ADOBE_LATIN_1 FXFM_ENC_TAG('l', 'a', 't', '1')
 #define FXFM_ENCODING_OLD_LATIN_2 FXFM_ENC_TAG('l', 'a', 't', '2')
 #define FXFM_ENCODING_APPLE_ROMAN FXFM_ENC_TAG('a', 'r', 'm', 'n')
-class IFX_FontEncodingEx : public IFX_FontEncoding {
+
+class CFX_UnicodeEncoding {
  public:
-  virtual FX_DWORD GlyphIndexFromName(const FX_CHAR* pStrName) = 0;
+  explicit CFX_UnicodeEncoding(CFX_Font* pFont);
+  virtual ~CFX_UnicodeEncoding();
 
-  virtual CFX_ByteString NameFromGlyphIndex(FX_DWORD dwGlyphIndex) = 0;
+  virtual FX_DWORD GlyphFromCharCode(FX_DWORD charcode);
 
-  virtual FX_DWORD CharCodeFromGlyphIndex(FX_DWORD dwGlyphIndex) = 0;
+ protected:
+  // Unowned, not nullptr.
+  CFX_Font* m_pFont;
 };
-IFX_FontEncodingEx* FX_CreateFontEncodingEx(
+
+class CFX_UnicodeEncodingEx : public CFX_UnicodeEncoding {
+ public:
+  CFX_UnicodeEncodingEx(CFX_Font* pFont, FX_DWORD EncodingID);
+  ~CFX_UnicodeEncodingEx() override;
+
+  // CFX_UnicodeEncoding:
+  FX_DWORD GlyphFromCharCode(FX_DWORD charcode) override;
+
+  FX_DWORD CharCodeFromUnicode(FX_WCHAR Unicode) const;
+
+ private:
+  FX_DWORD m_nEncodingID;
+};
+
+CFX_UnicodeEncodingEx* FX_CreateFontEncodingEx(
     CFX_Font* pFont,
     FX_DWORD nEncodingID = FXFM_ENCODING_NONE);
+
 #define FXFONT_SUBST_MM 0x01
 #define FXFONT_SUBST_GLYPHPATH 0x04
 #define FXFONT_SUBST_CLEARTYPE 0x08
 #define FXFONT_SUBST_TRANSFORM 0x10
 #define FXFONT_SUBST_NONSYMBOL 0x20
 #define FXFONT_SUBST_EXACT 0x40
 #define FXFONT_SUBST_STANDARD 0x80
 class CFX_SubstFont {
  public:
   CFX_SubstFont();
@@ skipping 306 matching lines @@
 class IFX_GSUBTable {
  public:
   static IFX_GSUBTable* Create(CFX_Font* pFont);
   virtual FX_BOOL GetVerticalGlyph(FX_DWORD glyphnum, FX_DWORD* vglyphnum) = 0;
 
  protected:
   virtual ~IFX_GSUBTable() {}
 };
 
 #endif  // CORE_INCLUDE_FXGE_FX_FONT_H_