Merge to XFA: Cleanup CFX_UnicodeEncoding and remove IFX_FontEncoding.

core/src/fxge/ge/text_int.h

Index: core/src/fxge/ge/text_int.h
diff --git a/core/src/fxge/ge/text_int.h b/core/src/fxge/ge/text_int.h
index 9279969e0a83aa2efede2971112b3f2fb134c3c3..b0193c4f2e9b07f979d7cdd8a11197511d12213a 100644
--- a/core/src/fxge/ge/text_int.h
+++ b/core/src/fxge/ge/text_int.h
@@ -41,23 +41,7 @@ class CTTFontDesc {
   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
@@ -105,25 +89,5 @@ class CFontFileFaceInfo {
   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_