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

core/src/fxcodec/jbig2/JBig2_ArithDecoder.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_ARITHMETIC_DECODER_H_
 #define _JBIG2_ARITHMETIC_DECODER_H_
 #include "JBig2_Define.h"
 #include "JBig2_BitStream.h"
 #include "JBig2_ArithQe.h"
-typedef struct {
+
+struct JBig2ArithCtx {
   unsigned int MPS;
   unsigned int I;
-} JBig2ArithCtx;
-class CJBig2_ArithDecoder : public CJBig2_Object {
+};
+
+class CJBig2_ArithDecoder {
  public:
-  CJBig2_ArithDecoder(CJBig2_BitStream* pStream);
+  explicit CJBig2_ArithDecoder(CJBig2_BitStream* pStream);
 
   ~CJBig2_ArithDecoder();
 
   int DECODE(JBig2ArithCtx* pCX);
 
  private:
   void INITDEC();
+  void BYTEIN();
 
-  void BYTEIN();
   unsigned char B;
   unsigned int C;
   unsigned int A;
   unsigned int CT;
   CJBig2_BitStream* m_pStream;
 };
+
 inline CJBig2_ArithDecoder::CJBig2_ArithDecoder(CJBig2_BitStream* pStream) {
   m_pStream = pStream;
   INITDEC();
 }
 inline CJBig2_ArithDecoder::~CJBig2_ArithDecoder() {}
 inline void CJBig2_ArithDecoder::INITDEC() {
   B = m_pStream->getCurByte_arith();
   C = (B ^ 0xff) << 16;
   ;
   BYTEIN();
@@ skipping 70 matching lines @@
         BYTEIN();
       }
       A <<= 1;
       C <<= 1;
       CT--;
     } while ((A & 0x8000) == 0);
   }
   return D;
 }
 #endif