Merge to XFA: Kill CFX_Object.

core/include/fxcrt/fx_basic.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_BASIC_H_
 #define _FX_BASIC_H_
 
 #include "fx_memory.h"
 #include "fx_stream.h"
 #include "fx_string.h"
 #include "fx_system.h"
 
 // The FX_ArraySize(arr) macro returns the # of elements in an array arr.
 // The expression is a compile-time constant, and therefore can be
 // used in defining new arrays, for example.  If you use FX_ArraySize on
 // a pointer by mistake, you will get a compile-time error.
 //
 // One caveat is that FX_ArraySize() doesn't accept any array of an
 // anonymous type or a type defined inside a function.
 #define FX_ArraySize(array) (sizeof(ArraySizeHelper(array)))
 
 // This template function declaration is used in defining FX_ArraySize.
 // Note that the function doesn't need an implementation, as we only
 // use its type.
 template <typename T, size_t N>
 char (&ArraySizeHelper(T (&array)[N]))[N];
 
-class CFX_BinaryBuf : public CFX_Object
+class CFX_BinaryBuf 
 {
 public:
     CFX_BinaryBuf();
     CFX_BinaryBuf(FX_STRSIZE size);
 
     ~CFX_BinaryBuf();
 
     void                                        Clear();
 
     void                                        EstimateSize(FX_STRSIZE size, FX_STRSIZE alloc_step = 0);
@@ skipping 107 matching lines @@
         return (FX_LPWSTR)m_pBuffer;
     }
 
     void                                        Delete(int start_index, int count)
     {
         CFX_BinaryBuf::Delete(start_index * sizeof(FX_WCHAR), count * sizeof(FX_WCHAR));
     }
 
     CFX_WideStringC                     GetWideString() const;
 };
-class CFX_ArchiveSaver : public CFX_Object
+class CFX_ArchiveSaver 
 {
 public:
     CFX_ArchiveSaver() : m_pStream(NULL) {}
 
     CFX_ArchiveSaver&           operator << (FX_BYTE i);
 
     CFX_ArchiveSaver&           operator << (int i);
 
     CFX_ArchiveSaver&           operator << (FX_DWORD i);
 
@@ skipping 22 matching lines @@
     void                                        SetStream(IFX_FileStream* pStream)
     {
         m_pStream = pStream;
     }
 protected:
 
     CFX_BinaryBuf                       m_SavingBuf;
 
     IFX_FileStream*                     m_pStream;
 };
-class CFX_ArchiveLoader : public CFX_Object
+class CFX_ArchiveLoader 
 {
 public:
 
     CFX_ArchiveLoader(FX_LPCBYTE pData, FX_DWORD dwSize);
 
     CFX_ArchiveLoader&          operator >> (FX_BYTE& i);
 
     CFX_ArchiveLoader&          operator >> (int& i);
 
     CFX_ArchiveLoader&          operator >> (FX_DWORD& i);
@@ skipping 41 matching lines @@
 protected:
 
     virtual     FX_BOOL                 DoWork(const void* pBuf, size_t size) = 0;
 
     FX_STRSIZE                          m_BufSize;
 
     FX_LPBYTE                           m_pBuffer;
 
     FX_STRSIZE                          m_Length;
 };
-class CFX_FileBufferArchive : public IFX_BufferArchive, public CFX_Object
+class CFX_FileBufferArchive : public IFX_BufferArchive
 {
 public:
     CFX_FileBufferArchive(FX_STRSIZE size = 32768);
     ~CFX_FileBufferArchive() override;
     virtual void                        Clear();
 
     FX_BOOL                                     AttachFile(IFX_StreamWrite *pFile, FX_BOOL bTakeover = FALSE);
 
     FX_BOOL                                     AttachFile(FX_LPCWSTR filename);
 
@@ skipping 71 matching lines @@
 protected:
 
     CFX_ByteTextBuf     m_Buffer;
 
     FX_DWORD            m_UTF16First;
 };
 CFX_ByteString FX_UrlEncode(const CFX_WideString& wsUrl);
 CFX_WideString FX_UrlDecode(const CFX_ByteString& bsUrl);
 CFX_ByteString FX_EncodeURI(const CFX_WideString& wsURI);
 CFX_WideString FX_DecodeURI(const CFX_ByteString& bsURI);
-class CFX_BasicArray : public CFX_Object
+class CFX_BasicArray 
 {
 protected:
     CFX_BasicArray(int unit_size);
 
     ~CFX_BasicArray();
 
     FX_BOOL                     SetSize(int nNewSize);
 
     FX_BOOL                     Append(const CFX_BasicArray& src);
 
@@ skipping 292 matching lines @@
     void                        RemoveAll()
     {
         for (int i = 0; i < m_nSize; i ++) {
             ((ObjectClass*)GetDataPtr(i))->~ObjectClass();
         }
         CFX_BasicArray::SetSize(0);
     }
 };
 typedef CFX_ObjectArray<CFX_ByteString> CFX_ByteStringArray;
 typedef CFX_ObjectArray<CFX_WideString> CFX_WideStringArray;
-class CFX_BaseSegmentedArray : public CFX_Object
+class CFX_BaseSegmentedArray 
 {
 public:
     CFX_BaseSegmentedArray(int unit_size = 1, int segment_units = 512, int index_size = 8);
 
     ~CFX_BaseSegmentedArray();
 
     void        SetUnitSize(int unit_size, int segment_units, int index_size = 8);
 
     void*       Add();
 
@@ skipping 48 matching lines @@
     {
         *(ElementType*)CFX_BaseSegmentedArray::Add() = data;
     }
 
     ElementType& operator [] (int index)
     {
         return *(ElementType*)CFX_BaseSegmentedArray::GetAt(index);
     }
 };
 template <class DataType, int FixedSize>
-class CFX_FixedBufGrow : public CFX_Object
+class CFX_FixedBufGrow 
 {
 public:
     CFX_FixedBufGrow() : m_pData(NULL)
     {}
     CFX_FixedBufGrow(int data_size) : m_pData(NULL)
     {
         if (data_size > FixedSize) {
             m_pData = FX_Alloc(DataType, data_size);
         } else {
             FXSYS_memset32(m_Data, 0, sizeof(DataType)*FixedSize);
@@ skipping 44 matching lines @@
         FXSYS_assert(m_pData != NULL);
         return m_pData[i];
     }
     operator DataType*()
     {
         return m_pData;
     }
 private:
     DataType*           m_pData;
 };
-class CFX_MapPtrToPtr : public CFX_Object
+class CFX_MapPtrToPtr 
 {
 protected:
 
     struct CAssoc {
 
         CAssoc* pNext;
 
         void* key;
 
         void* value;
@@ skipping 96 matching lines @@
 
     void GetNextAssoc(FX_POSITION& rNextPosition, KeyType& rKey, ValueType& rValue) const
     {
         void* pKey = NULL;
         void* pValue = NULL;
         CFX_MapPtrToPtr::GetNextAssoc(rNextPosition, pKey, pValue);
         rKey = (KeyType)(FX_UINTPTR)pKey;
         rValue = (ValueType)(FX_UINTPTR)pValue;
     }
 };
-class CFX_CMapDWordToDWord : public CFX_Object
+class CFX_CMapDWordToDWord 
 {
 public:
 
     FX_BOOL                     Lookup(FX_DWORD key, FX_DWORD& value) const;
 
     void                        SetAt(FX_DWORD key, FX_DWORD value);
 
     void                        EstimateSize(FX_DWORD size, FX_DWORD grow_by);
 
     FX_POSITION         GetStartPosition() const;
 
     void                        GetNextAssoc(FX_POSITION& pos, FX_DWORD& key, FX_DWORD& value) const;
 protected:
 
     CFX_BinaryBuf       m_Buffer;
 };
-class CFX_MapByteStringToPtr : public CFX_Object
+class CFX_MapByteStringToPtr 
 {
 protected:
 
     struct CAssoc {
 
         CAssoc* pNext;
 
         FX_DWORD nHashValue;
 
         CFX_ByteString key;
@@ skipping 59 matching lines @@
 
     CAssoc* NewAssoc();
 
     void FreeAssoc(CAssoc* pAssoc);
 
     CAssoc* GetAssocAt(FX_BSTR key, FX_DWORD& hash) const;
 public:
 
     ~CFX_MapByteStringToPtr();
 };
-class CFX_CMapByteStringToPtr : public CFX_Object
+class CFX_CMapByteStringToPtr 
 {
 public:
     CFX_CMapByteStringToPtr();
 
     ~CFX_CMapByteStringToPtr();
 
     void                        RemoveAll();
 
     FX_POSITION         GetStartPosition() const;
 
     void                        GetNextAssoc(FX_POSITION& rNextPosition, CFX_ByteString& rKey, void*& rValue) const;
 
     FX_LPVOID           GetNextValue(FX_POSITION& rNextPosition) const;
 
     FX_BOOL                     Lookup(FX_BSTR key, void*& rValue) const;
 
     void                        SetAt(FX_BSTR key, void* value);
 
     void                        RemoveKey(FX_BSTR key);
 
     int                         GetCount() const;
 
     void                        AddValue(FX_BSTR key, void* pValue);
 private:
 
     CFX_BaseSegmentedArray                      m_Buffer;
 };
-class CFX_PtrList : public CFX_Object
+class CFX_PtrList 
 {
 protected:
 
     struct CNode {
 
         CNode* pNext;
 
         CNode* pPrev;
 
         void* data;
@@ skipping 128 matching lines @@
         return FALSE;
     }
 
     FX_BOOL                                     RemovePrivateData(FX_LPVOID module_id);
 protected:
 
     CFX_ArrayTemplate<FX_PRIVATEDATA>   m_DataList;
 
     void                                        AddData(FX_LPVOID module_id, FX_LPVOID pData, PD_CALLBACK_FREEDATA callback, FX_BOOL bSelfDestruct);
 };
-class CFX_BitStream : public CFX_Object
+class CFX_BitStream 
 {
 public:
 
     void                                Init(FX_LPCBYTE pData, FX_DWORD dwSize);
 
 
     FX_DWORD                    GetBits(FX_DWORD nBits);
 
     void                                ByteAlign();
 
@@ skipping 12 matching lines @@
         m_BitPos = 0;
     }
 protected:
 
     FX_DWORD                    m_BitPos;
 
     FX_DWORD                    m_BitSize;
 
     FX_LPCBYTE                  m_pData;
 };
-template <class ObjClass> class CFX_CountRef : public CFX_Object
+template <class ObjClass> class CFX_CountRef 
 {
 public:
 
     typedef CFX_CountRef<ObjClass> Ref;
 
     class CountedObj : public ObjClass
     {
     public:
 
         CountedObj() {}
@@ skipping 129 matching lines @@
 protected:
 
     CountedObj*                 m_pObject;
 };
 class IFX_Pause
 {
 public:
     virtual ~IFX_Pause() { }
     virtual FX_BOOL     NeedToPauseNow() = 0;
 };
-class CFX_DataFilter : public CFX_Object
+class CFX_DataFilter 
 {
 public:
 
     virtual ~CFX_DataFilter();
 
     void                        SetDestFilter(CFX_DataFilter* pFilter);
 
     FX_BOOL                     IsEOF() const
     {
         return m_bEOF;
@@ skipping 54 matching lines @@
     }
     T*          operator ->(void)
     {
         return m_pObj;
     }
 protected:
     T *m_pObj;
 };
 #define FX_DATALIST_LENGTH      1024
 template<size_t unit>
-class CFX_SortListArray : public CFX_Object
+class CFX_SortListArray 
 {
 protected:
 
     struct DataList {
 
         FX_INT32        start;
 
         FX_INT32        count;
         FX_LPBYTE       data;
     };
@@ skipping 93 matching lines @@
                     iStart = iMid + 1;
                 }
             }
         }
         m_DataLists.InsertAt(iFind, list);
     }
     FX_INT32            m_CurList;
     CFX_ArrayTemplate<DataList> m_DataLists;
 };
 template<typename T1, typename T2>
-class CFX_ListArrayTemplate : public CFX_Object
+class CFX_ListArrayTemplate 
 {
 public:
 
     void                        Clear()
     {
         m_Data.Clear();
     }
 
     void                        Add(FX_INT32 nStart, FX_INT32 nCount)
     {
@@ skipping 27 matching lines @@
 #define ProgressiveStatus       FX_ProgressiveStatus
 #define FX_NAMESPACE_DECLARE(namespace, type)       namespace::type
 class IFX_Unknown
 {
 public:
     virtual FX_DWORD    Release() = 0;
     virtual FX_DWORD    AddRef() = 0;
 };
 #define FX_IsOdd(a)     ((a) & 1)
 
-class CFX_Vector_3by1 : public CFX_Object
+class CFX_Vector_3by1 
 {
 public:
 
     CFX_Vector_3by1() :
         a(0.0f), b(0.0f), c(0.0f)
     {}
 
     CFX_Vector_3by1(FX_FLOAT a1, FX_FLOAT b1, FX_FLOAT c1):
         a(a1), b(b1), c(c1)
     {}
 
     FX_FLOAT a;
     FX_FLOAT b;
     FX_FLOAT c;
 };
-class CFX_Matrix_3by3 : public CFX_Object
+class CFX_Matrix_3by3 
 {
 public:
 
     CFX_Matrix_3by3():
         a(0.0f), b(0.0f), c(0.0f), d(0.0f), e(0.0f), f(0.0f), g(0.0f), h(0.0f), i(0.0f)
     {}
 
     CFX_Matrix_3by3(FX_FLOAT a1, FX_FLOAT b1, FX_FLOAT c1, FX_FLOAT d1, FX_FLOAT e1, FX_FLOAT f1, FX_FLOAT g1, FX_FLOAT h1, FX_FLOAT i1) :
         a(a1), b(b1), c(c1), d(d1), e(e1), f(f1), g(g1), h(h1), i(i1)
     {}
 
     CFX_Matrix_3by3 Inverse();
 
     CFX_Matrix_3by3 Multiply(const CFX_Matrix_3by3 &m);
 
     CFX_Vector_3by1 TransformVector(const CFX_Vector_3by1 &v);
 
     FX_FLOAT a;
     FX_FLOAT b;
     FX_FLOAT c;
     FX_FLOAT d;
     FX_FLOAT e;
     FX_FLOAT f;
     FX_FLOAT g;
     FX_FLOAT h;
     FX_FLOAT i;
 };
 
 #endif