XFA: merge patch from issue 801913002 and 804463003

core/src/fpdftext/fpdf_text_int.cpp

 // Copyright 2014 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 "../../include/fpdfapi/fpdf_resource.h"
 #include "../../include/fpdfapi/fpdf_pageobj.h"
 #include "../../include/fpdftext/fpdf_text.h"
 #include "../../include/fpdfapi/fpdf_page.h"
@@ skipping 142 matching lines @@
         if(nCount) {
             m_CharIndex.Add(0);
         }
         for(int i = 0; i < nCount; i++) {
             int indexSize = m_CharIndex.GetSize();
             FX_BOOL bNormal = FALSE;
             PAGECHAR_INFO charinfo = *(PAGECHAR_INFO*)m_charList.GetAt(i);
             if(charinfo.m_Flag == FPDFTEXT_CHAR_GENERATED) {
                 bNormal = TRUE;
             }
-#ifdef FOXIT_CHROME_BUILD
             else if(charinfo.m_Unicode == 0 || IsControlChar(&charinfo))
-#else
-            else if(charinfo.m_Unicode == 0)
-#endif
                 bNormal = FALSE;
             else {
                 bNormal = TRUE;
             }
             if(bNormal) {
                 if(indexSize % 2) {
                     m_CharIndex.Add(1);
                 } else {
                     if(indexSize <= 0) {
                         continue;
@@ skipping 933 matching lines @@
         for(int i = start; i < end; i++) {
             m_TextBuf.AppendChar(str.GetAt(i));
             m_charList.Add(*(PAGECHAR_INFO*)m_TempCharList.GetAt(i));
         }
     }
 }
 void CPDF_TextPage::AddCharInfoByLRDirection(CFX_WideString& str, int i)
 {
     PAGECHAR_INFO Info = *(PAGECHAR_INFO*)m_TempCharList.GetAt(i);
     FX_WCHAR wChar = str.GetAt(i);
-#ifdef FOXIT_CHROME_BUILD
     if(!IsControlChar(&Info)) {
-#else
-    if(wChar != 0xfffe) {
-#endif
         Info.m_Index = m_TextBuf.GetLength();
         if (wChar >= 0xFB00 && wChar <= 0xFB06) {
             FX_LPWSTR pDst = NULL;
             FX_STRSIZE nCount = FX_Unicode_GetNormalization(wChar, pDst);
             if (nCount >= 1) {
                 pDst = FX_Alloc(FX_WCHAR, nCount);
                 if (!pDst) {
                     return;
                 }
                 FX_Unicode_GetNormalization(wChar, pDst);
@@ skipping 14 matching lines @@
     } else {
         Info.m_Index = -1;
     }
     if( !m_ParseOptions.m_bGetCharCodeOnly) {
         m_charList.Add(Info);
     }
 }
 void CPDF_TextPage::AddCharInfoByRLDirection(CFX_WideString& str, int i)
 {
     PAGECHAR_INFO Info = *(PAGECHAR_INFO*)m_TempCharList.GetAt(i);
-#ifdef FOXIT_CHROME_BUILD
     if(!IsControlChar(&Info)) {
-#else
-    if(str.GetAt(i) != 0xfffe) {
-#endif
         Info.m_Index = m_TextBuf.GetLength();
         FX_WCHAR wChar = FX_GetMirrorChar(str.GetAt(i), TRUE, FALSE);
         FX_LPWSTR pDst = NULL;
         FX_STRSIZE nCount = FX_Unicode_GetNormalization(wChar, pDst);
         if (nCount >= 1) {
             pDst = FX_Alloc(FX_WCHAR, nCount);
             if (!pDst) {
                 return;
             }
             FX_Unicode_GetNormalization(wChar, pDst);
@@ skipping 456 matching lines @@
                 if (0x2D == curChar || 0xAD == curChar) {
                     return;
                 }
             }
             while (m_TempTextBuf.GetSize() > 0 && m_TempTextBuf.GetWideString().GetAt(m_TempTextBuf.GetLength() - 1) == 0x20) {
                 m_TempTextBuf.Delete(m_TempTextBuf.GetLength() - 1, 1);
                 m_TempCharList.Delete(m_TempCharList.GetSize() - 1);
             }
             PAGECHAR_INFO* cha = (PAGECHAR_INFO*)m_TempCharList.GetAt(m_TempCharList.GetSize() - 1);
             m_TempTextBuf.Delete(m_TempTextBuf.GetLength() - 1, 1);
-#ifdef FOXIT_CHROME_BUILD
             cha->m_Unicode = 0x2;
             cha->m_Flag = FPDFTEXT_CHAR_HYPHEN;
             m_TempTextBuf.AppendChar(0xfffe);
-#else
-            cha->m_Unicode = 0;
-            m_TempTextBuf.AppendChar(0xfffe);
-#endif
         }
     } else {
         m_CurlineRect = CFX_FloatRect(Obj.m_pTextObj->m_Left, Obj.m_pTextObj->m_Bottom, Obj.m_pTextObj->m_Right, Obj.m_pTextObj->m_Top);
     }
     if (FPDFTEXT_MC_DELAY == bPreMKC) {
         ProcessMarkedContent(Obj);
         m_pPreTextObj = pTextObj;
         m_perMatrix.Copy(formMatrix);
         return;
     }
@@ skipping 1189 matching lines @@
     if (!m_IsParserd || index < 0 || index >= m_LinkList.GetSize()) {
         return;
     }
     CPDF_LinkExt* link = NULL;
     link = m_LinkList.GetAt(index);
     if (!link) {
         return ;
     }
     m_pTextPage->GetRectArray(link->m_Start, link->m_Count, rects);
 }