Merge to XFA: Cleanup CFX_UnicodeEncoding and remove IFX_FontEncoding.

core/src/fxge/ge/text_int.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_SRC_FXGE_GE_TEXT_INT_H_
 #define CORE_SRC_FXGE_GE_TEXT_INT_H_
 
 struct _CFX_UniqueKeyGen {
@@ skipping 23 matching lines @@
       FX_BOOL m_bBold;
       FXFT_Face m_pFace;
     } m_SingleFace;
     struct {
       FXFT_Face m_pFaces[16];
     } m_TTCFace;
   };
   uint8_t* m_pFontData;
   int m_RefCount;
 };
-class CFX_UnicodeEncoding : public IFX_FontEncoding {
- public:
-  CFX_UnicodeEncoding(CFX_Font* pFont);
-  virtual FX_DWORD GlyphFromCharCodeEx(FX_DWORD charcode,
-                                       int encoding = ENCODING_UNICODE);
 
- private:
-  CFX_Font* m_pFont;
-  virtual FX_DWORD GlyphFromCharCode(FX_DWORD charcode);
-  virtual CFX_WideString UnicodeFromCharCode(FX_DWORD charcode) const {
-    return CFX_WideString((FX_WCHAR)charcode);
-  }
-  virtual FX_DWORD CharCodeFromUnicode(FX_WCHAR Unicode) const {
-    return Unicode;
-  }
-  virtual FX_BOOL IsUnicodeCompatible() const { return TRUE; }
-};
 #define CHARSET_FLAG_ANSI 1
 #define CHARSET_FLAG_SYMBOL 2
 #define CHARSET_FLAG_SHIFTJIS 4
 #define CHARSET_FLAG_BIG5 8
 #define CHARSET_FLAG_GB 16
 #define CHARSET_FLAG_KOREAN 32
 
 class CFX_FontFaceInfo {
  public:
   CFX_FontFaceInfo(CFX_ByteString filePath,
@@ skipping 27 matching lines @@
   FXFT_Face m_Face;
   CFX_ByteString m_FaceName;
   FX_DWORD m_Charsets;
   FX_DWORD m_FileSize;
   FX_DWORD m_FontOffset;
   int m_Weight;
   FX_BOOL m_bItalic;
   int m_PitchFamily;
   CFX_ByteString m_FontTables;
 };
-class CFX_FontEncodingEX : public IFX_FontEncodingEx {
- public:
-  CFX_FontEncodingEX();
-  FX_BOOL Init(CFX_Font* pFont, FX_DWORD EncodingID);
-  virtual FX_DWORD GlyphIndexFromName(const FX_CHAR* pStrName);
-  virtual CFX_ByteString NameFromGlyphIndex(FX_DWORD dwGlyphIndex);
-  virtual FX_DWORD CharCodeFromGlyphIndex(FX_DWORD dwGlyphIndex);
-  virtual FX_DWORD GlyphFromCharCode(FX_DWORD charcode);
-  virtual CFX_WideString UnicodeFromCharCode(FX_DWORD charcode) const;
-  virtual FX_DWORD CharCodeFromUnicode(FX_WCHAR Unicode) const;
-  virtual FX_BOOL IsUnicodeCompatible() const;
-  virtual FX_DWORD GlyphFromCharCodeEx(FX_DWORD charcode,
-                                       int encoding = ENCODING_UNICODE) {
-    return GlyphFromCharCode(charcode);
-  }
-
- private:
-  CFX_Font* m_pFont;
-  FX_DWORD m_nEncodingID;
-};
 
 #endif  // CORE_SRC_FXGE_GE_TEXT_INT_H_