3 files changed, 83 insertions, 54 deletions
diff --git a/core/fxge/include/cfx_unicodeencoding.h b/core/fxge/include/cfx_unicodeencoding.h
new file mode 100644
index 0000000000..dee785f9df
--- /dev/null
+++ b/core/fxge/include/cfx_unicodeencoding.h
@@ -0,0 +1,46 @@
+// Copyright 2016 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_FXGE_INCLUDE_CFX_UNICODEENCODING_H_
+#define CORE_FXGE_INCLUDE_CFX_UNICODEENCODING_H_
+
+#include "core/fxge/include/fx_font.h"
+
+#define ENCODING_INTERNAL 0
+#define ENCODING_UNICODE 1
+
+#ifdef PDF_ENABLE_XFA
+#define FXFM_ENC_TAG(a, b, c, d)                                          \
+  (((uint32_t)(a) << 24) | ((uint32_t)(b) << 16) | ((uint32_t)(c) << 8) | \
+   (uint32_t)(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')
+#endif  // PDF_ENABLE_XFA
+
+class CFX_UnicodeEncoding {
+ public:
+  explicit CFX_UnicodeEncoding(CFX_Font* pFont);
+  virtual ~CFX_UnicodeEncoding();
+
+  virtual uint32_t GlyphFromCharCode(uint32_t charcode);
+
+ protected:
+  CFX_Font* m_pFont;  // Unowned, not nullptr.
+};
+
+#endif  // CORE_FXGE_INCLUDE_CFX_UNICODEENCODING_H_
diff --git a/core/fxge/include/cfx_unicodeencodingex.h b/core/fxge/include/cfx_unicodeencodingex.h
new file mode 100644
index 0000000000..2ce062faf3
--- /dev/null
+++ b/core/fxge/include/cfx_unicodeencodingex.h
@@ -0,0 +1,37 @@
+// Copyright 2016 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_FXGE_INCLUDE_CFX_UNICODEENCODINGEX_H_
+#define CORE_FXGE_INCLUDE_CFX_UNICODEENCODINGEX_H_
+
+#include <map>
+#include <memory>
+#include <vector>
+
+#include "core/fxcrt/include/fx_system.h"
+#include "core/fxge/include/cfx_unicodeencoding.h"
+#include "core/fxge/include/fx_dib.h"
+#include "core/fxge/include/fx_freetype.h"
+
+class CFX_UnicodeEncodingEx : public CFX_UnicodeEncoding {
+ public:
+  CFX_UnicodeEncodingEx(CFX_Font* pFont, uint32_t EncodingID);
+  ~CFX_UnicodeEncodingEx() override;
+
+  // CFX_UnicodeEncoding:
+  uint32_t GlyphFromCharCode(uint32_t charcode) override;
+
+  uint32_t CharCodeFromUnicode(FX_WCHAR Unicode) const;
+
+ private:
+  uint32_t m_nEncodingID;
+};
+
+CFX_UnicodeEncodingEx* FX_CreateFontEncodingEx(
+    CFX_Font* pFont,
+    uint32_t nEncodingID = FXFM_ENCODING_NONE);
+
+#endif  // CORE_FXGE_INCLUDE_CFX_UNICODEENCODINGEX_H_
diff --git a/core/fxge/include/fx_font.h b/core/fxge/include/fx_font.h
index bb7632d1db..e6ffc6be4b 100644
--- a/core/fxge/include/fx_font.h
+++ b/core/fxge/include/fx_font.h
@@ -156,60 +156,6 @@ class CFX_Font {
   FX_BOOL m_bVertical;
 };
 
-#define ENCODING_INTERNAL 0
-#define ENCODING_UNICODE 1
-
-#ifdef PDF_ENABLE_XFA
-#define FXFM_ENC_TAG(a, b, c, d)                                          \
-  (((uint32_t)(a) << 24) | ((uint32_t)(b) << 16) | ((uint32_t)(c) << 8) | \
-   (uint32_t)(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')
-#endif  // PDF_ENABLE_XFA
-
-class CFX_UnicodeEncoding {
- public:
-  explicit CFX_UnicodeEncoding(CFX_Font* pFont);
-  virtual ~CFX_UnicodeEncoding();
-
-  virtual uint32_t GlyphFromCharCode(uint32_t charcode);
-
- protected:
-  // Unowned, not nullptr.
-  CFX_Font* m_pFont;
-};
-
-#ifdef PDF_ENABLE_XFA
-class CFX_UnicodeEncodingEx : public CFX_UnicodeEncoding {
- public:
-  CFX_UnicodeEncodingEx(CFX_Font* pFont, uint32_t EncodingID);
-  ~CFX_UnicodeEncodingEx() override;
-
-  // CFX_UnicodeEncoding:
-  uint32_t GlyphFromCharCode(uint32_t charcode) override;
-
-  uint32_t CharCodeFromUnicode(FX_WCHAR Unicode) const;
-
- private:
-  uint32_t m_nEncodingID;
-};
-CFX_UnicodeEncodingEx* FX_CreateFontEncodingEx(
-    CFX_Font* pFont,
-    uint32_t nEncodingID = FXFM_ENCODING_NONE);
-#endif  // PDF_ENABLE_XFA
-
 #define FXFONT_SUBST_MM 0x01
 #define FXFONT_SUBST_GLYPHPATH 0x04
 #define FXFONT_SUBST_CLEARTYPE 0x08