Merge to XFA: Kill CFX_Object.

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 _FX_ARABIC_IMP
 #define _FX_ARABIC_IMP
 typedef struct _FX_ARABICCHARRANGE {
     FX_WCHAR wStart;
     FX_WCHAR wEnd;
 } FX_ARABICCHARRANGE;
-class CFX_ArabicChar : public IFX_ArabicChar, public CFX_Object
+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;
@@ skipping 148 matching lines @@
 #define FX_BNALn        FX_BIDINEUTRALACTION_Ln
 #define FX_BNAIn        FX_BIDINEUTRALACTION_In
 #define FX_BNALnL       FX_BIDINEUTRALACTION_LnL
 FX_INT32 FX_BidiGetDeferredNeutrals(FX_INT32 iAction, FX_INT32 iLevel);
 FX_INT32 FX_BidiGetResolvedNeutrals(FX_INT32 iAction);
 void FX_BidiResolveNeutrals(FX_INT32 iBaseLevel, CFX_Int32Array &classes, const CFX_Int32Array &levels);
 void FX_BidiResolveImplicit(const CFX_Int32Array &classes, CFX_Int32Array &levels);
 void FX_BidiResolveWhitespace(FX_INT32 iBaseLevel, const CFX_Int32Array &classes, CFX_Int32Array &levels);
 FX_INT32 FX_BidiReorderLevel(FX_INT32 iBaseLevel, CFX_WideString &wsText, const CFX_Int32Array &levels, FX_INT32 iStart, FX_BOOL bReverse = FALSE);
 void FX_BidiReorder(FX_INT32 iBaseLevel, CFX_WideString &wsText, const CFX_Int32Array &levels);
-class CFX_BidiChar : public IFX_BidiChar, public CFX_Object
+class CFX_BidiChar FX_FINAL : public IFX_BidiChar
 {
 public:
     CFX_BidiChar();
     virtual void                Release() FX_OVERRIDE
     {
         delete this;
     }
     virtual void                SetPolicy(FX_BOOL bSeparateNeutral = TRUE) FX_OVERRIDE
     {
         m_bSeparateNeutral = bSeparateNeutral;
     }
     virtual FX_BOOL             AppendChar(FX_WCHAR wch) FX_OVERRIDE;
     virtual FX_BOOL             EndChar() FX_OVERRIDE;
     virtual FX_INT32    GetBidiInfo(FX_INT32 &iStart, FX_INT32 &iCount) FX_OVERRIDE;
     virtual void                Reset() FX_OVERRIDE;
 
 private:
     ~CFX_BidiChar() { }
     FX_BOOL             m_bSeparateNeutral;
     FX_INT32    m_iCurStart;
     FX_INT32    m_iCurCount;
     FX_INT32    m_iCurBidi;
     FX_INT32    m_iLastBidi;
     FX_INT32    m_iLastStart;
     FX_INT32    m_iLastCount;
 };
 #endif