XFA: Manual merge of Clean up IFX_BidiChar

core/src/fxcrt/fx_arabic.h

 // 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
 
 #ifndef CORE_SRC_FXCRT_FX_ARABIC_H_
 #define CORE_SRC_FXCRT_FX_ARABIC_H_
 
 #include "../../include/fxcrt/fx_arb.h"
 
 class CFX_ArabicChar : public IFX_ArabicChar {
  public:
   virtual void Release() { delete this; }
   virtual FX_BOOL IsArabicChar(FX_WCHAR wch) const;
   virtual FX_BOOL IsArabicFormChar(FX_WCHAR wch) const;
 
   virtual FX_WCHAR GetFormChar(FX_WCHAR wch,
                                FX_WCHAR prev = 0,
                                FX_WCHAR next = 0) const;
   virtual FX_WCHAR GetFormChar(const CFX_Char* cur,
                                const CFX_Char* prev,
                                const CFX_Char* next) const;
 
  protected:
-  FX_LPCARBFORMTABLE ParseChar(const CFX_Char* pTC,
-                               FX_WCHAR& wChar,
-                               FX_CHARTYPE& eType) const;
+  const FX_ARBFORMTABLE* ParseChar(const CFX_Char* pTC,
+                                   FX_WCHAR& wChar,
+                                   FX_CHARTYPE& eType) const;
 };
 void FX_BidiReverseString(CFX_WideString& wsText,
                           int32_t iStart,
                           int32_t iCount);
 void FX_BidiSetDeferredRun(CFX_Int32Array& values,
                            int32_t iStart,
                            int32_t iCount,
                            int32_t iValue);
 #define FX_BCON FX_BIDICLASS_ON
 #define FX_BCL FX_BIDICLASS_L
@@ skipping 161 matching lines @@
                               const CFX_Int32Array& classes,
                               CFX_Int32Array& levels);
 int32_t FX_BidiReorderLevel(int32_t iBaseLevel,
                             CFX_WideString& wsText,
                             const CFX_Int32Array& levels,
                             int32_t iStart,
                             FX_BOOL bReverse = FALSE);
 void FX_BidiReorder(int32_t iBaseLevel,
                     CFX_WideString& wsText,
                     const CFX_Int32Array& levels);
-class CFX_BidiChar final : public IFX_BidiChar {
- public:
-  CFX_BidiChar();
-  ~CFX_BidiChar() override {}
-
-  void SetPolicy(FX_BOOL bSeparateNeutral = TRUE) override;
-  FX_BOOL AppendChar(FX_WCHAR wch) override;
-  FX_BOOL EndChar() override;
-  int32_t GetBidiInfo(int32_t& iStart, int32_t& iCount) override;
-  void Reset() override;
-
- private:
-  FX_BOOL m_bSeparateNeutral;
-  int32_t m_iCurStart;
-  int32_t m_iCurCount;
-  int32_t m_iCurBidi;
-  int32_t m_iLastBidi;
-  int32_t m_iLastStart;
-  int32_t m_iLastCount;
-};
 
 #endif  // CORE_SRC_FXCRT_FX_ARABIC_H_