XFA: Manual merge of Clean up IFX_BidiChar

core/include/fxcrt/fx_arb.h

Index: core/include/fxcrt/fx_arb.h
diff --git a/core/include/fxcrt/fx_arb.h b/core/include/fxcrt/fx_arb.h
index d3612db4e7085ac8499ccadbbbe347ed57f1d200..071094c610abaa15f435ac0a635e304ebb64b7f7 100644
--- a/core/include/fxcrt/fx_arb.h
+++ b/core/include/fxcrt/fx_arb.h
@@ -11,7 +11,6 @@
 #include "fx_ucd.h"
 
 class IFX_ArabicChar;
-class IFX_BidiChar;
 #ifdef __cplusplus

[Tom Sepez, 2015/10/27 16:41:05]

nit: this file won't compile under C given the classes above.  So you can just
extern "C" it, period.  Having done that, I didn't see a reason why this would
need C calling semantics (e.g. not passed as fn pointers).

[Lei Zhang, 2015/10/29 21:59:06]

Done.

 extern "C" {
 #endif
@@ -65,16 +64,5 @@ void FX_BidiLine(CFX_TxtCharArray& chars,
 void FX_BidiLine(CFX_RTFCharArray& chars,
                  int32_t iCount,
                  int32_t iBaseLevel = 0);
-class IFX_BidiChar {
- public:
-  static IFX_BidiChar* Create();
-  virtual ~IFX_BidiChar() {}
-
-  virtual void SetPolicy(FX_BOOL bSeparateNeutral = TRUE) = 0;
-  virtual FX_BOOL AppendChar(FX_WCHAR wch) = 0;
-  virtual FX_BOOL EndChar() = 0;
-  virtual int32_t GetBidiInfo(int32_t& iStart, int32_t& iCount) = 0;
-  virtual void Reset() = 0;
-};
 
 #endif  // CORE_INCLUDE_FXCRT_FX_ARB_H_