commit 12e9c8c8b577eb8de6b600b5f19d8b1dec411f77
author Lei Zhang <thestig@chromium.org> Wed Jan 07 23:50:22 2015 -0800
committer Lei Zhang <thestig@chromium.org> Wed Jan 07 23:50:22 2015 -0800
tree c2d4d79a515cca1228e9d1c427fb85f9ef37bc14
parent ef8fb8c4c3ab9b93421389b8399fce3923ead735

Transform font size to user space for valid text size comparison.

BUG=438441

https://codereview.chromium.org/816153002

(Manual merge of commit a09d50d09259bd90c865e92026a69f5434678e71)

Review URL: https://codereview.chromium.org/814303003

core/src/fpdftext/fpdf_text_int.cpp

diff --git a/core/src/fpdftext/fpdf_text_int.cpp b/core/src/fpdftext/fpdf_text_int.cpp
index 5b174f0..bbb38b4 100644
--- a/core/src/fpdftext/fpdf_text_int.cpp
+++ b/core/src/fpdftext/fpdf_text_int.cpp
@@ -1844,13 +1844,14 @@
             int nTotal = wstrItem.GetLength();
             int n = 0;
             FX_BOOL bDel = FALSE;
+            FX_FLOAT threshold = charinfo.m_Matrix.TransformXDistance((FX_FLOAT)TEXT_CHARRATIO_GAPDELTA * pTextObj->GetFontSize());
             while (n < m_TempCharList.GetSize() && n < 7) {
                 n++;
                 PAGECHAR_INFO* charinfo1 = (PAGECHAR_INFO*)m_TempCharList.GetAt(m_TempCharList.GetSize() - n);
                 if(charinfo1->m_CharCode == charinfo.m_CharCode &&
                         charinfo1->m_pTextObj->GetFont() == charinfo.m_pTextObj->GetFont()  &&
-                        FXSYS_fabs(charinfo1->m_OriginX - charinfo.m_OriginX) < TEXT_CHARRATIO_GAPDELTA * pTextObj->GetFontSize()  &&
-                        FXSYS_fabs(charinfo1->m_OriginY - charinfo.m_OriginY) < TEXT_CHARRATIO_GAPDELTA * pTextObj->GetFontSize() ) {
+                        FXSYS_fabs(charinfo1->m_OriginX - charinfo.m_OriginX) < threshold  &&
+                        FXSYS_fabs(charinfo1->m_OriginY - charinfo.m_OriginY) < threshold) {
                     bDel = TRUE;
                     break;
                 }