Merge to XFA: Cleanup JBig2_GeneralDecoder.cpp.

core/src/fxcodec/jbig2/JBig2_GeneralDecoder.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_GENERAL_DECODER_H_
 #define _JBIG2_GENERAL_DECODER_H_
 
 #include "../../../include/fxcodec/fx_codec_def.h"
@@ skipping 44 matching lines @@
   FX_BOOL MMR;
   FX_DWORD GBW;
   FX_DWORD GBH;
   uint8_t GBTEMPLATE;
   FX_BOOL TPGDON;
   FX_BOOL USESKIP;
   CJBig2_Image* SKIP;
   int8_t GBAT[8];
 
  private:
+  bool UseTemplate0Opt3() const;
+  bool UseTemplate1Opt3() const;
+  bool UseTemplate23Opt3() const;
+
   FXCODEC_STATUS decode_Arith(IFX_Pause* pPause);
   FXCODEC_STATUS decode_Arith_Template0_opt3(CJBig2_Image* pImage,
                                              CJBig2_ArithDecoder* pArithDecoder,
                                              JBig2ArithCtx* gbContext,
                                              IFX_Pause* pPause);
   FXCODEC_STATUS decode_Arith_Template0_unopt(
       CJBig2_Image* pImage,
       CJBig2_ArithDecoder* pArithDecoder,
       JBig2ArithCtx* gbContext,
       IFX_Pause* pPause);
@@ skipping 197 matching lines @@
 
  public:
   FX_BOOL GSMMR;
   FX_BOOL GSUSESKIP;
   uint8_t GSBPP;
   FX_DWORD GSW, GSH;
   uint8_t GSTEMPLATE;
   CJBig2_Image* GSKIP;
 };
 #endif