commit 623e636edcd5d8582f7358f7b2f9a4f9636a899e
author Lei Zhang <thestig@chromium.org> Fri Dec 14 17:27:51 2018 +0000
committer Chromium commit bot <commit-bot@chromium.org> Fri Dec 14 17:27:51 2018 +0000
tree e51bfe87ad6ba15aa2fe708ec7e968ea270f608f
parent caacc5ffb136e649638af857636ecf5e4f7d9e0e

Call GetGlyphWidth() fewer times in LoadCompositeFont().

If LoadCompositeFont() already knows the width for a given glyph index,
avoid calling CFX_Font::GetGlyphWidth() to calculate it again. Repeated
calls to GetGlyphWidth(), which calls FT_Load_Glyph(), can be very slow.

BUG=chromium:906338

Change-Id: Ifb3ff027f0953a34d1275fdc97a972dbe89ad473
Reviewed-on: https://pdfium-review.googlesource.com/c/47282
Reviewed-by: Nicolás Peña Moreno <npm@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>

fpdfsdk/fpdf_edittext.cpp

diff --git a/fpdfsdk/fpdf_edittext.cpp b/fpdfsdk/fpdf_edittext.cpp
index ca4d6f7..2478c23 100644
--- a/fpdfsdk/fpdf_edittext.cpp
+++ b/fpdfsdk/fpdf_edittext.cpp
@@ -351,7 +351,8 @@
     if (currentChar > kMaxUnicode)
       break;
 
-    widths[glyphIndex] = pFont->GetGlyphWidth(glyphIndex);
+    if (!pdfium::ContainsKey(widths, glyphIndex))
+      widths[glyphIndex] = pFont->GetGlyphWidth(glyphIndex);
     to_unicode[glyphIndex] = currentChar;
     currentChar =
         FXFT_Get_Next_Char(pFont->GetFace(), currentChar, &glyphIndex);