Merge to XFA: Kill CFX_Object.

core/src/fxcodec/codec/fx_codec_progress.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_CODEC_PROGRESS_H_
 #define _FX_CODEC_PROGRESS_H_
 #define FXCODEC_BLOCK_SIZE 4096
 #define FXCODEC_PNG_GAMMA       2.2
 #if _FX_OS_ == _FX_MACOSX_ || _FX_OS_ == _FX_IOS_
 #       undef FXCODEC_PNG_GAMMA
 #       define FXCODEC_PNG_GAMMA        1.7
 #endif
 struct PixelWeight {
     int         m_SrcStart;
     int         m_SrcEnd;
     int         m_Weights[1];
 };
-class CFXCODEC_WeightTable : public CFX_Object
+class CFXCODEC_WeightTable
 {
 public:
     CFXCODEC_WeightTable()
     {
         m_pWeightTables = NULL;
     }
     ~CFXCODEC_WeightTable()
     {
         if(m_pWeightTables != NULL) {
             FX_Free(m_pWeightTables);
         }
     }
 
     void                        Calc(int dest_len, int dest_min, int dest_max, int src_len, int src_min, int src_max, FX_BOOL bInterpol);
     PixelWeight*        GetPixelWeight(int pixel)
     {
         return (PixelWeight*)(m_pWeightTables + (pixel - m_DestMin) * m_ItemSize);
     }
 
     int                         m_DestMin, m_ItemSize;
     FX_LPBYTE           m_pWeightTables;
 };
-class CFXCODEC_HorzTable : public CFX_Object
+class CFXCODEC_HorzTable
 {
 public:
     CFXCODEC_HorzTable()
     {
         m_pWeightTables = NULL;
     }
     ~CFXCODEC_HorzTable()
     {
         if(m_pWeightTables != NULL) {
             FX_Free(m_pWeightTables);
         }
     }
 
     void                        Calc(int dest_len, int src_len, FX_BOOL bInterpol);
     PixelWeight*        GetPixelWeight(int pixel)
     {
         return (PixelWeight*)(m_pWeightTables + pixel * m_ItemSize);
     }
 
     int                         m_ItemSize;
     FX_LPBYTE           m_pWeightTables;
 };
-class CFXCODEC_VertTable : public CFX_Object
+class CFXCODEC_VertTable
 {
 public:
     CFXCODEC_VertTable()
     {
         m_pWeightTables = NULL;
     }
     ~CFXCODEC_VertTable()
     {
         if(m_pWeightTables != NULL) {
             FX_Free(m_pWeightTables);
@@ skipping 120 matching lines @@
     int                 m_FrameCur;
     int                         m_GifBgIndex;
     FX_LPBYTE           m_pGifPalette;
     FX_INT32            m_GifPltNumber;
     int                         m_GifTransIndex;
     FX_RECT                     m_GifFrameRect;
     FX_BOOL                     m_BmpIsTopBottom;
     FXCODEC_STATUS m_status;
 };
 #endif