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

core/src/fxcodec/jbig2/JBig2_BitStream.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_BIT_STREAM_H_
 #define _JBIG2_BIT_STREAM_H_
+
 #include "JBig2_Define.h"
-class CJBig2_BitStream : public CJBig2_Object {
+
+class CJBig2_BitStream {
  public:
   CJBig2_BitStream(uint8_t* pBuffer, FX_DWORD dwLength);
 
   CJBig2_BitStream(CJBig2_BitStream& bs);
 
   ~CJBig2_BitStream();
 
   int32_t readNBits(FX_DWORD nBits, FX_DWORD* dwResult);
 
   int32_t readNBits(FX_DWORD nBits, int32_t* nResult);
@@ skipping 257 matching lines @@
 inline uint8_t* CJBig2_BitStream::getPointer() {
   return m_pBuf + m_dwByteIdx;
 }
 inline void CJBig2_BitStream::offset(FX_DWORD dwOffset) {
   m_dwByteIdx += dwOffset;
 }
 inline FX_DWORD CJBig2_BitStream::getByteLeft() {
   return m_dwLength - m_dwByteIdx;
 }
 #endif