XFA: Manual merge of Clean up IFX_BidiChar

core/src/fxcrt/fx_arabic.h

Index: core/src/fxcrt/fx_arabic.h
diff --git a/core/src/fxcrt/fx_arabic.h b/core/src/fxcrt/fx_arabic.h
index 83893e37746e62748625d01062f8984935033b0b..31ed2dac613e1263a8acba14a759b4d0d7ee44ff 100644
--- a/core/src/fxcrt/fx_arabic.h
+++ b/core/src/fxcrt/fx_arabic.h
@@ -207,25 +207,5 @@ int32_t FX_BidiReorderLevel(int32_t iBaseLevel,
 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_