1 files changed, 12 insertions, 8 deletions
diff --git a/core/fxcodec/jbig2/JBig2_GrdProc.h b/core/fxcodec/jbig2/JBig2_GrdProc.h
index 0ee52512d9..a78e8cdbc1 100644
--- a/core/fxcodec/jbig2/JBig2_GrdProc.h
+++ b/core/fxcodec/jbig2/JBig2_GrdProc.h
@@ -22,11 +22,15 @@ struct JBig2ArithCtx;
 
 class CJBig2_GRDProc {
  public:
-  struct ProgressiveArithDecodeState {
+  class ProgressiveArithDecodeState {
+   public:
+    ProgressiveArithDecodeState();
+    ~ProgressiveArithDecodeState();
+
     std::unique_ptr<CJBig2_Image>* pImage;
-    CJBig2_ArithDecoder* pArithDecoder;
-    JBig2ArithCtx* gbContext;
-    PauseIndicatorIface* pPause;
+    UnownedPtr<CJBig2_ArithDecoder> pArithDecoder;
+    UnownedPtr<JBig2ArithCtx> gbContext;
+    UnownedPtr<PauseIndicatorIface> pPause;
   };
 
   CJBig2_GRDProc();
@@ -42,12 +46,12 @@ class CJBig2_GRDProc {
   const FX_RECT& GetReplaceRect() const { return m_ReplaceRect; }
 
   bool MMR;
-  uint32_t GBW;
-  uint32_t GBH;
-  uint8_t GBTEMPLATE;
   bool TPGDON;
   bool USESKIP;
-  CJBig2_Image* SKIP;
+  uint8_t GBTEMPLATE;
+  uint32_t GBW;
+  uint32_t GBH;
+  UnownedPtr<CJBig2_Image> SKIP;
   int8_t GBAT[8];
 
  private: