Fix spaces too wide in XFA Dropdown.

CFGAS_PDFFontMgr::GetCharWidth() is only used for spaces, for no
good reason I could find. It's broken in this case too, returning
a default value of 600 for any character.

This CL removes this method and its only usage that led to finding
this issue.

Bug: pdfium:1083
Change-Id: I954de45101715b5af05169612fb5eca1b1a170b4
Reviewed-on: https://pdfium-review.googlesource.com/32740
Commit-Queue: dsinclair <dsinclair@chromium.org>
Reviewed-by: dsinclair <dsinclair@chromium.org>

1 files changed, 13 insertions, 15 deletions

diff --git a/xfa/fgas/font/cfgas_gefont.cpp b/xfa/fgas/font/cfgas_gefont.cpp
index b6ec23a414..740504f088 100644
--- a/xfa/fgas/font/cfgas_gefont.cpp
+++ b/xfa/fgas/font/cfgas_gefont.cpp
@@ -164,23 +164,21 @@ bool CFGAS_GEFont::GetCharWidth(wchar_t wUnicode, int32_t* pWidth) {
   if (*pWidth > 0)
     return true;
 
-  if (!m_pProvider || !m_pProvider->GetCharWidth(RetainPtr<CFGAS_GEFont>(this),
-                                                 wUnicode, pWidth)) {
-    RetainPtr<CFGAS_GEFont> pFont;
-    int32_t iGlyph;
-    std::tie(iGlyph, pFont) = GetGlyphIndexAndFont(wUnicode, true);
-    if (iGlyph != 0xFFFF && pFont) {
-      if (pFont.Get() == this) {
-        *pWidth = m_pFont->GetGlyphWidth(iGlyph);
-        if (*pWidth < 0)
-          *pWidth = -1;
-      } else if (pFont->GetCharWidth(wUnicode, pWidth)) {
-        return true;
-      }
-    } else {
-      *pWidth = -1;
+  RetainPtr<CFGAS_GEFont> pFont;
+  int32_t iGlyph;
+  std::tie(iGlyph, pFont) = GetGlyphIndexAndFont(wUnicode, true);
+  if (iGlyph != 0xFFFF && pFont) {
+    if (pFont.Get() == this) {
+      *pWidth = m_pFont->GetGlyphWidth(iGlyph);
+      if (*pWidth < 0)
+        *pWidth = -1;
+    } else if (pFont->GetCharWidth(wUnicode, pWidth)) {
+      return true;
     }
+  } else {
+    *pWidth = -1;
   }
+
   m_CharWidthMap[wUnicode] = *pWidth;
   return *pWidth > 0;
 }