Merge to XFA: Remove CJBig2_Object, CJBig2_Module, and friends.

TBR=tsepez@chromium.org

Review URL: https://codereview.chromium.org/1326953006 .

(cherry picked from commit 70f4404e9a9e69afdfdd07715aa946f6561ce0cb)

Review URL: https://codereview.chromium.org/1336783002 .

3 files changed, 3 insertions, 32 deletions

diff --git a/core/src/fxcodec/codec/codec_int.h b/core/src/fxcodec/codec/codec_int.h
index ee7fe3ba6f..a37f7bd7b8 100644
--- a/core/src/fxcodec/codec/codec_int.h
+++ b/core/src/fxcodec/codec/codec_int.h
@@ -347,33 +347,6 @@ class CCodec_TiffModule : public ICodec_TiffModule {
   ~CCodec_TiffModule() override {}
 };
 
-class CPDF_Jbig2Interface : public CJBig2_Module {
- public:
-  virtual void* JBig2_Malloc(FX_DWORD dwSize) {
-    return FX_Alloc(uint8_t, dwSize);
-  }
-  virtual void* JBig2_Malloc2(FX_DWORD num, FX_DWORD dwSize) {
-    if (dwSize && num >= UINT_MAX / dwSize) {
-      return NULL;
-    }
-    return FX_Alloc(uint8_t, num * dwSize);
-  }
-  virtual void* JBig2_Malloc3(FX_DWORD num, FX_DWORD dwSize, FX_DWORD dwSize2) {
-    if (dwSize2 && dwSize >= UINT_MAX / dwSize2) {
-      return NULL;
-    }
-    FX_DWORD size = dwSize2 * dwSize;
-    if (size && num >= UINT_MAX / size) {
-      return NULL;
-    }
-    return FX_Alloc(uint8_t, num * size);
-  }
-  virtual void* JBig2_Realloc(void* pMem, FX_DWORD dwSize) {
-    return FX_Realloc(uint8_t, pMem, dwSize);
-  }
-  virtual void JBig2_Free(void* pMem) { FX_Free(pMem); }
-};
-
 class CCodec_Jbig2Context {
  public:
   CCodec_Jbig2Context();
@@ -414,7 +387,6 @@ class CCodec_Jbig2Module : public ICodec_Jbig2Module {
   void DestroyJbig2Context(void* pJbig2Context) override;
 
  private:
-  CPDF_Jbig2Interface m_Module;
   std::list<CJBig2_CachePair> m_SymbolDictCache;
 };
 class CFX_DIBAttributeExif : public IFX_DIBAttributeExif {
diff --git a/core/src/fxcodec/codec/fx_codec_fax.cpp b/core/src/fxcodec/codec/fx_codec_fax.cpp
index 63a45c7aea..394e22b013 100644
--- a/core/src/fxcodec/codec/fx_codec_fax.cpp
+++ b/core/src/fxcodec/codec/fx_codec_fax.cpp
@@ -590,8 +590,7 @@ FX_DWORD CCodec_FaxDecoder::GetSrcOffset() {
   return ret;
 }
 extern "C" {
-void _FaxG4Decode(void*,
-                  const uint8_t* src_buf,
+void _FaxG4Decode(const uint8_t* src_buf,
                   FX_DWORD src_size,
                   int* pbitpos,
                   uint8_t* dest_buf,
diff --git a/core/src/fxcodec/codec/fx_codec_jbig.cpp b/core/src/fxcodec/codec/fx_codec_jbig.cpp
index b95461b3e5..9361604b9d 100644
--- a/core/src/fxcodec/codec/fx_codec_jbig.cpp
+++ b/core/src/fxcodec/codec/fx_codec_jbig.cpp
@@ -48,8 +48,8 @@ FXCODEC_STATUS CCodec_Jbig2Module::StartDecode(void* pJbig2Context,
   m_pJbig2Context->m_bFileReader = FALSE;
   FXSYS_memset(dest_buf, 0, height * dest_pitch);
   m_pJbig2Context->m_pContext = CJBig2_Context::CreateContext(
-      &m_Module, (uint8_t*)global_data, global_size, (uint8_t*)src_buf,
-      src_size, JBIG2_EMBED_STREAM, &m_SymbolDictCache, pPause);
+      global_data, global_size, src_buf, src_size, JBIG2_EMBED_STREAM,
+      &m_SymbolDictCache, pPause);
   if (!m_pJbig2Context->m_pContext) {
     return FXCODEC_STATUS_ERROR;
   }