Cleanup 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 e4c1ddacf244ad65d4769c32921a7d1e816252cf..0888145eaffbff3903745dee133a8e2d557ea7af 100644
--- a/core/src/fxcrt/fx_arabic.h
+++ b/core/src/fxcrt/fx_arabic.h
@@ -13,22 +13,33 @@ 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;
+    ~CFX_BidiChar() 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;
+    // IFX_BidiChar

[Tom Sepez, 2015/06/19 20:30:32]

nit: maybe colon after IFX_BidiChar:

+    bool AppendChar(FX_WCHAR wch) override;
+    bool EndChar() override;
+    Direction GetBidiInfo(int32_t* iStart, int32_t* iCount) override;
+
+    void SaveCurrentStateToLastState();
+
+    // Position of the current segment.
+    int32_t m_iCurStart;
+
+    // Number of characters in the current segment.
+    int32_t m_iCurCount;
+
+    // Direction of the current segment.
+    Direction m_CurBidi;
+
+    // Number of characters in the last segment.
+    int32_t m_iLastStart;
+
+    // Number of characters in the last segment.
+    int32_t m_iLastCount;
+
+    // Direction of the last segment.
+    Direction m_LastBidi;
 };
 
 #endif  // CORE_SRC_FXCRT_FX_ARABIC_H_