XFA: Manual merge of Clean up IFX_BidiChar

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 <ctype.h>
 #include <algorithm>
 
 #include "../../../third_party/base/nonstd_unique_ptr.h"
 #include "../../include/fpdfapi/fpdf_module.h"
 #include "../../include/fpdfapi/fpdf_page.h"
 #include "../../include/fpdfapi/fpdf_pageobj.h"
 #include "../../include/fpdfapi/fpdf_resource.h"
 #include "../../include/fpdftext/fpdf_text.h"
-#include "../../include/fxcrt/fx_arb.h"
+#include "../../include/fxcrt/fx_bidi.h"
 #include "../../include/fxcrt/fx_ucd.h"
 #include "text_int.h"
 
 namespace {
 
 FX_BOOL _IsIgnoreSpaceCharacter(FX_WCHAR curChar) {
   if (curChar < 255) {
     return FALSE;
   }
   if ((curChar >= 0x0600 && curChar <= 0x06FF) ||
@@ skipping 967 matching lines @@
     pFont->AppendChar(str, charCode);
     w = pFont->GetStringWidth(str, 1);
     if (w == 0) {
       FX_RECT BBox;
       pFont->GetCharBBox(charCode, BBox);
       w = BBox.right - BBox.left;
     }
   }
   return w;
 }
-void CPDF_TextPage::OnPiece(IFX_BidiChar* pBidi, CFX_WideString& str) {
+void CPDF_TextPage::OnPiece(CFX_BidiChar* pBidi, CFX_WideString& str) {
   int32_t start, count;
-  int32_t ret = pBidi->GetBidiInfo(start, count);
-  if (ret == 2) {
+  CFX_BidiChar::Direction ret = pBidi->GetBidiInfo(&start, &count);
+  if (ret == CFX_BidiChar::RIGHT) {
     for (int i = start + count - 1; i >= start; i--) {
       m_TextBuf.AppendChar(str.GetAt(i));
       m_charList.Add(*(PAGECHAR_INFO*)m_TempCharList.GetAt(i));
     }
   } else {
     int end = start + count;
     for (int i = start; i < end; i++) {
       m_TextBuf.AppendChar(str.GetAt(i));
       m_charList.Add(*(PAGECHAR_INFO*)m_TempCharList.GetAt(i));
     }
@@ skipping 60 matching lines @@
   }
   if (!m_ParseOptions.m_bGetCharCodeOnly) {
     m_charList.Add(Info);
   }
 }
 void CPDF_TextPage::CloseTempLine() {
   int count1 = m_TempCharList.GetSize();
   if (count1 <= 0) {
     return;
   }
-  nonstd::unique_ptr<IFX_BidiChar> pBidiChar(IFX_BidiChar::Create());
+  nonstd::unique_ptr<CFX_BidiChar> pBidiChar(new CFX_BidiChar);
   CFX_WideString str = m_TempTextBuf.GetWideString();
   CFX_WordArray order;
   FX_BOOL bR2L = FALSE;
   int32_t start = 0, count = 0;
   int nR2L = 0, nL2R = 0;
   FX_BOOL bPrevSpace = FALSE;
   for (int i = 0; i < str.GetLength(); i++) {
     if (str.GetAt(i) == 32) {
       if (bPrevSpace) {
         m_TempTextBuf.Delete(i, 1);
         m_TempCharList.Delete(i);
         str.Delete(i);
         count1--;
         i--;
         continue;
       }
       bPrevSpace = TRUE;
     } else {
       bPrevSpace = FALSE;
     }
     if (pBidiChar->AppendChar(str.GetAt(i))) {
-      int32_t ret = pBidiChar->GetBidiInfo(start, count);
+      CFX_BidiChar::Direction ret = pBidiChar->GetBidiInfo(&start, &count);
       order.Add(start);
       order.Add(count);
       order.Add(ret);
       if (!bR2L) {
-        if (ret == 2) {
+        if (ret == CFX_BidiChar::RIGHT) {
           nR2L++;
-        } else if (ret == 1) {
+        } else if (ret == CFX_BidiChar::LEFT) {
           nL2R++;
         }
       }
     }
   }
   if (pBidiChar->EndChar()) {
-    int32_t ret = pBidiChar->GetBidiInfo(start, count);
+    CFX_BidiChar::Direction ret = pBidiChar->GetBidiInfo(&start, &count);
     order.Add(start);
     order.Add(count);
     order.Add(ret);
     if (!bR2L) {
-      if (ret == 2) {
+      if (ret == CFX_BidiChar::RIGHT) {
         nR2L++;
-      } else if (ret == 1) {
+      } else if (ret == CFX_BidiChar::LEFT) {
         nL2R++;
       }
     }
   }
   if (nR2L > 0 && nR2L >= nL2R) {
     bR2L = TRUE;
   }
   if (m_parserflag == FPDFTEXT_RLTB || bR2L) {
     int count = order.GetSize();
     for (int i = count - 1; i > 0; i -= 3) {
@@ skipping 411 matching lines @@
     m_pPreTextObj = pTextObj;
     m_perMatrix.Copy(formMatrix);
     return;
   }
   m_pPreTextObj = pTextObj;
   m_perMatrix.Copy(formMatrix);
   int nItems = pTextObj->CountItems();
   FX_FLOAT baseSpace = _CalculateBaseSpace(pTextObj, matrix);
 
   FX_BOOL bIsBidiAndMirrosInverse = FALSE;
-  IFX_BidiChar* BidiChar = IFX_BidiChar::Create();
+  CFX_BidiChar* BidiChar = new CFX_BidiChar;
   int32_t nR2L = 0;
   int32_t nL2R = 0;
   int32_t start = 0, count = 0;
   CPDF_TextObjectItem item;
   for (int32_t i = 0; i < nItems; i++) {
     pTextObj->GetItemInfo(i, &item);
     if (item.m_CharCode == (FX_DWORD)-1) {
       continue;
     }
     CFX_WideString wstrItem = pFont->UnicodeFromCharCode(item.m_CharCode);
     FX_WCHAR wChar = wstrItem.GetAt(0);
     if ((wstrItem.IsEmpty() || wChar == 0) && item.m_CharCode) {
       wChar = (FX_WCHAR)item.m_CharCode;
     }
     if (!wChar) {
       continue;
     }
     if (BidiChar && BidiChar->AppendChar(wChar)) {
-      int32_t ret = BidiChar->GetBidiInfo(start, count);
-      if (ret == 2) {
+      CFX_BidiChar::Direction ret = BidiChar->GetBidiInfo(&start, &count);
+      if (ret == CFX_BidiChar::RIGHT) {
         nR2L++;
-      } else if (ret == 1) {
+      } else if (ret == CFX_BidiChar::LEFT) {
         nL2R++;
       }
     }
   }
   if (BidiChar && BidiChar->EndChar()) {
-    int32_t ret = BidiChar->GetBidiInfo(start, count);
-    if (ret == 2) {
+    CFX_BidiChar::Direction ret = BidiChar->GetBidiInfo(&start, &count);
+    if (ret == CFX_BidiChar::RIGHT) {
       nR2L++;
-    } else if (ret == 1) {
+    } else if (ret == CFX_BidiChar::LEFT) {
       nL2R++;
     }
   }
   FX_BOOL bR2L = FALSE;
   if (nR2L > 0 && nR2L >= nL2R) {
     bR2L = TRUE;
   }
   bIsBidiAndMirrosInverse =
       bR2L && (matrix.a * matrix.d - matrix.b * matrix.c) < 0;
   int32_t iBufStartAppend = m_TempTextBuf.GetLength();
@@ skipping 1151 matching lines @@
   if (!m_bIsParsed || 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);
 }