Merge to XFA: Make a bunch of JBig2 classes independent of CJBig2_Object.

core/src/fxcodec/jbig2/JBig2_Segment.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 _JBIG2_SEGMENT_H_
 #define _JBIG2_SEGMENT_H_
 #include "JBig2_Define.h"
 #include "JBig2_SymbolDict.h"
@@ skipping 10 matching lines @@
   JBIG2_SEGMENT_PAUSED,
   JBIG2_SEGMENT_ERROR
 } JBig2_SegmentState;
 typedef enum {
   JBIG2_VOID_POINTER = 0,
   JBIG2_IMAGE_POINTER,
   JBIG2_SYMBOL_DICT_POINTER,
   JBIG2_PATTERN_DICT_POINTER,
   JBIG2_HUFFMAN_TABLE_POINTER
 } JBig2_ResultType;
-class CJBig2_Segment : public CJBig2_Object {
+class CJBig2_Segment {
  public:
   CJBig2_Segment();
 
   ~CJBig2_Segment();
 
-  void clean();
-
- public:
   FX_DWORD m_dwNumber;
   union {
     struct {
       uint8_t type : 6;
       uint8_t page_association_size : 1;
       uint8_t deferred_non_retain : 1;
     } s;
     uint8_t c;
   } m_cFlags;
   int32_t m_nReferred_to_segment_count;
   FX_DWORD* m_pReferred_to_segment_numbers;
   FX_DWORD m_dwPage_association;
   FX_DWORD m_dwData_length;
 
   FX_DWORD m_dwHeader_Length;
   uint8_t* m_pData;
   JBig2_SegmentState m_State;
   JBig2_ResultType m_nResultType;
   union {
     CJBig2_SymbolDict* sd;
     CJBig2_PatternDict* pd;
     CJBig2_Image* im;
     CJBig2_HuffmanTable* ht;
     void* vd;
   } m_Result;
 };
 #endif