Refactor fx_font part 2

core/fxge/ge/cfx_unicodeencodingex.cpp

Index: core/fxge/ge/cfx_unicodeencodingex.cpp
diff --git a/core/fxge/ge/cfx_unicodeencodingex.cpp b/core/fxge/ge/cfx_unicodeencodingex.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..f718a99c0f042b609c7e5336dfb5162fa81874a3
--- /dev/null
+++ b/core/fxge/ge/cfx_unicodeencodingex.cpp
@@ -0,0 +1,102 @@
+// 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
+
+#include "core/fxge/include/cfx_unicodeencodingex.h"
+
+#include "core/fpdfapi/fpdf_font/include/cpdf_font.h"
+#include "core/fxge/include/fx_font.h"
+#include "core/fxge/include/fx_freetype.h"
+
+#ifdef PDF_ENABLE_XFA

[dsinclair, 2016/08/18 15:14:52]

Instead of wrapping the whole file in an ENABLE_XFA, can you just move the file
in the BUILD.gn to a if (pdf_enable_xfa) section and then remove the ifdef.

[npm, 2016/08/18 17:36:41]

Done.

+
+const uint32_t g_EncodingID[] = {

[dsinclair, 2016/08/18 15:14:52]

Move into an anonymous namespace.

[npm, 2016/08/18 17:36:41]

Done.

+    FXFM_ENCODING_MS_SYMBOL,     FXFM_ENCODING_UNICODE,
+    FXFM_ENCODING_MS_SJIS,       FXFM_ENCODING_MS_GB2312,
+    FXFM_ENCODING_MS_BIG5,       FXFM_ENCODING_MS_WANSUNG,
+    FXFM_ENCODING_MS_JOHAB,      FXFM_ENCODING_ADOBE_STANDARD,
+    FXFM_ENCODING_ADOBE_EXPERT,  FXFM_ENCODING_ADOBE_CUSTOM,
+    FXFM_ENCODING_ADOBE_LATIN_1, FXFM_ENCODING_OLD_LATIN_2,
+    FXFM_ENCODING_APPLE_ROMAN,
+};
+
+CFX_UnicodeEncodingEx* _FXFM_CreateFontEncoding(CFX_Font* pFont,

[dsinclair, 2016/08/18 15:14:52]

Remove _ prefix as it's reserved by the compiler.  (and put in an anonymous
namespace if only used in this file)

[npm, 2016/08/18 17:36:41]

Done.

+                                                uint32_t nEncodingID) {
+  if (FXFT_Select_Charmap(pFont->GetFace(), nEncodingID))
+    return nullptr;
+  return new CFX_UnicodeEncodingEx(pFont, nEncodingID);
+}
+
+CFX_UnicodeEncodingEx::CFX_UnicodeEncodingEx(CFX_Font* pFont,
+                                             uint32_t EncodingID)
+    : CFX_UnicodeEncoding(pFont), m_nEncodingID(EncodingID) {}
+
+CFX_UnicodeEncodingEx::~CFX_UnicodeEncodingEx() {}
+
+uint32_t CFX_UnicodeEncodingEx::GlyphFromCharCode(uint32_t charcode) {
+  FXFT_Face face = m_pFont->GetFace();
+  FT_UInt nIndex = FXFT_Get_Char_Index(face, charcode);
+  if (nIndex > 0) {
+    return nIndex;
+  }

[dsinclair, 2016/08/18 15:14:52]

nit: {}'s

[npm, 2016/08/18 17:36:41]

Done.

+  int nmaps = FXFT_Get_Face_CharmapCount(face);
+  int m = 0;
+  while (m < nmaps) {
+    uint32_t nEncodingID =
+        FXFT_Get_Charmap_Encoding(FXFT_Get_Face_Charmaps(face)[m++]);
+    if (m_nEncodingID == nEncodingID) {
+      continue;
+    }
+    int error = FXFT_Select_Charmap(face, nEncodingID);
+    if (error) {
+      continue;
+    }
+    nIndex = FXFT_Get_Char_Index(face, charcode);
+    if (nIndex > 0) {
+      m_nEncodingID = nEncodingID;
+      return nIndex;
+    }
+  }
+  FXFT_Select_Charmap(face, m_nEncodingID);
+  return 0;
+}
+
+uint32_t CFX_UnicodeEncodingEx::CharCodeFromUnicode(FX_WCHAR Unicode) const {
+  if (m_nEncodingID == FXFM_ENCODING_UNICODE ||
+      m_nEncodingID == FXFM_ENCODING_MS_SYMBOL) {
+    return Unicode;
+  }
+  FXFT_Face face = m_pFont->GetFace();
+  int nmaps = FXFT_Get_Face_CharmapCount(face);
+  for (int i = 0; i < nmaps; i++) {
+    int nEncodingID =
+        FXFT_Get_Charmap_Encoding(FXFT_Get_Face_Charmaps(face)[i]);
+    if (nEncodingID == FXFM_ENCODING_UNICODE ||
+        nEncodingID == FXFM_ENCODING_MS_SYMBOL) {
+      return Unicode;
+    }
+  }
+  return CPDF_Font::kInvalidCharCode;
+}
+
+CFX_UnicodeEncodingEx* FX_CreateFontEncodingEx(CFX_Font* pFont,
+                                               uint32_t nEncodingID) {
+  if (!pFont || !pFont->GetFace())
+    return nullptr;
+
+  if (nEncodingID != FXFM_ENCODING_NONE)
+    return _FXFM_CreateFontEncoding(pFont, nEncodingID);
+
+  for (size_t i = 0; i < FX_ArraySize(g_EncodingID); ++i) {
+    CFX_UnicodeEncodingEx* pFontEncoding =
+        _FXFM_CreateFontEncoding(pFont, g_EncodingID[i]);
+    if (pFontEncoding) {
+      return pFontEncoding;
+    }
+  }
+  return nullptr;
+}
+
+#endif  // PDF_ENABLE_XFA