fxcrt convergence - XFA side.

core/src/fxcrt/fx_arabic.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/fxcrt/fx_ucd.h"
 #include "fx_arabic.h"
 
-extern const FX_DWORD gs_FX_TextLayout_CodeProperties[65536];
 #ifdef __cplusplus
 extern "C" {
 #endif
 static const FX_ARBFORMTABLE g_FX_ArabicFormTables[] = {
     {0xFE81, 0xFE82, 0xFE81, 0xFE82}, {0xFE83, 0xFE84, 0xFE83, 0xFE84},
     {0xFE85, 0xFE86, 0xFE85, 0xFE86}, {0xFE87, 0xFE88, 0xFE87, 0xFE88},
     {0xFE89, 0xFE8A, 0xFE8B, 0xFE8C}, {0xFE8D, 0xFE8E, 0xFE8D, 0xFE8E},
     {0xFE8F, 0xFE90, 0xFE91, 0xFE92}, {0xFE93, 0xFE94, 0xFE93, 0xFE94},
     {0xFE95, 0xFE96, 0xFE97, 0xFE98}, {0xFE99, 0xFE9A, 0xFE9B, 0xFE9C},
     {0xFE9D, 0xFE9E, 0xFE9F, 0xFEA0}, {0xFEA1, 0xFEA2, 0xFEA3, 0xFEA4},
@@ skipping 121 matching lines @@
   return shadda;
 }
 #ifdef __cplusplus
 };
 #endif
 IFX_ArabicChar* IFX_ArabicChar::Create() {
   return new CFX_ArabicChar;
 }
 FX_BOOL CFX_ArabicChar::IsArabicChar(FX_WCHAR wch) const {
   FX_DWORD dwRet =
-      (gs_FX_TextLayout_CodeProperties[(FX_WORD)wch] & FX_CHARTYPEBITSMASK);
+      kTextLayoutCodeProperties[(FX_WORD)wch] & FX_CHARTYPEBITSMASK;
   return dwRet >= FX_CHARTYPE_ArabicAlef;
 }
 FX_BOOL CFX_ArabicChar::IsArabicFormChar(FX_WCHAR wch) const {
-  return (gs_FX_TextLayout_CodeProperties[(FX_WORD)wch] &
-          FX_CHARTYPEBITSMASK) == FX_CHARTYPE_ArabicForm;
+  return (kTextLayoutCodeProperties[(FX_WORD)wch] & FX_CHARTYPEBITSMASK) ==
+         FX_CHARTYPE_ArabicForm;
 }
 FX_WCHAR CFX_ArabicChar::GetFormChar(FX_WCHAR wch,
                                      FX_WCHAR prev,
                                      FX_WCHAR next) const {
-  CFX_Char c(wch, gs_FX_TextLayout_CodeProperties[(FX_WORD)wch]);
-  CFX_Char p(prev, gs_FX_TextLayout_CodeProperties[(FX_WORD)prev]);
-  CFX_Char n(next, gs_FX_TextLayout_CodeProperties[(FX_WORD)next]);
+  CFX_Char c(wch, kTextLayoutCodeProperties[(FX_WORD)wch]);
+  CFX_Char p(prev, kTextLayoutCodeProperties[(FX_WORD)prev]);
+  CFX_Char n(next, kTextLayoutCodeProperties[(FX_WORD)next]);
   return GetFormChar(&c, &p, &n);
 }
 FX_WCHAR CFX_ArabicChar::GetFormChar(const CFX_Char* cur,
                                      const CFX_Char* prev,
                                      const CFX_Char* next) const {
   FX_CHARTYPE eCur;
   FX_WCHAR wCur;
   FX_LPCARBFORMTABLE ft = ParseChar(cur, wCur, eCur);
   if (eCur < FX_CHARTYPE_ArabicAlef || eCur >= FX_CHARTYPE_ArabicNormal) {
     return wCur;
@@ skipping 78 matching lines @@
                      CFX_Int32Array& classes,
                      FX_BOOL bWS) {
   FXSYS_assert(wsText.GetLength() == classes.GetSize());
   int32_t iCount = wsText.GetLength();
   const FX_WCHAR* pwsStart = (const FX_WCHAR*)wsText;
   FX_WCHAR wch;
   int32_t iCls;
   if (bWS) {
     for (int32_t i = 0; i < iCount; i++) {
       wch = *pwsStart++;
-      iCls = ((gs_FX_TextLayout_CodeProperties[(FX_WORD)wch] &
-               FX_BIDICLASSBITSMASK) >>
-              FX_BIDICLASSBITS);
+      iCls =
+          ((kTextLayoutCodeProperties[(FX_WORD)wch] & FX_BIDICLASSBITSMASK) >>
+           FX_BIDICLASSBITS);
       classes.SetAt(i, iCls);
     }
   } else {
     for (int32_t i = 0; i < iCount; i++) {
       wch = *pwsStart++;
-      iCls = ((gs_FX_TextLayout_CodeProperties[(FX_WORD)wch] &
-               FX_BIDICLASSBITSMASK) >>
-              FX_BIDICLASSBITS);
+      iCls =
+          ((kTextLayoutCodeProperties[(FX_WORD)wch] & FX_BIDICLASSBITSMASK) >>
+           FX_BIDICLASSBITS);
       classes.SetAt(i, gc_FX_BidiNTypes[iCls]);
     }
   }
 }
 int32_t FX_BidiResolveExplicit(int32_t iBaseLevel,
                                int32_t iDirection,
                                CFX_Int32Array& classes,
                                CFX_Int32Array& levels,
                                int32_t iStart,
                                int32_t iCount,
@@ skipping 779 matching lines @@
       m_iCurCount(0),
       m_iCurBidi(0),
       m_iLastBidi(0),
       m_iLastStart(0),
       m_iLastCount(0) {}
 void CFX_BidiChar::SetPolicy(FX_BOOL bSeparateNeutral) {
   m_bSeparateNeutral = bSeparateNeutral;
 }
 
 FX_BOOL CFX_BidiChar::AppendChar(FX_WCHAR wch) {
-  FX_DWORD dwProps = gs_FX_TextLayout_CodeProperties[(FX_WORD)wch];
+  FX_DWORD dwProps = kTextLayoutCodeProperties[(FX_WORD)wch];
   int32_t iBidiCls = (dwProps & FX_BIDICLASSBITSMASK) >> FX_BIDICLASSBITS;
   int32_t iContext = 0;
   switch (iBidiCls) {
     case FX_BIDICLASS_L:
     case FX_BIDICLASS_AN:
     case FX_BIDICLASS_EN:
       iContext = 1;
       break;
     case FX_BIDICLASS_R:
     case FX_BIDICLASS_AL:
@@ skipping 37 matching lines @@
   return m_iLastBidi;
 }
 void CFX_BidiChar::Reset() {
   m_iCurStart = 0;
   m_iCurCount = 0;
   m_iCurBidi = 0;
   m_iLastBidi = 0;
   m_iLastStart = 0;
   m_iLastCount = 0;
 }