summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorTom Sepez <tsepez@chromium.org>2017-05-30 09:36:04 -0700
committerChromium commit bot <commit-bot@chromium.org>2017-05-30 17:16:05 +0000
commit9a505796f3fe8c1d0cbc3f7e4e7db41fc1fde137 (patch)
treedaa8b031893b193cfd6d623aa4ace17b325ce991 /core
parentb58ff22b729a9b141a7d735254ffa2cbf3ce2b22 (diff)
downloadpdfium-9a505796f3fe8c1d0cbc3f7e4e7db41fc1fde137.tar.xz
Do not store pointer to IFX_Pause in CCodec_Jbig2Context
It's passed everywhere it is needed, and there's no reason to believe that any specific instance will outlive the context. Bug: 727245 Change-Id: Ie902d02fc668fb5c21adb9c4d8eb329008f3a665 Reviewed-on: https://pdfium-review.googlesource.com/6078 Reviewed-by: dsinclair <dsinclair@chromium.org> Commit-Queue: Tom Sepez <tsepez@chromium.org>
Diffstat (limited to 'core')
-rw-r--r--core/fxcodec/codec/ccodec_jbig2module.h2
-rw-r--r--core/fxcodec/codec/fx_codec_jbig.cpp4
2 files changed, 1 insertions, 5 deletions
diff --git a/core/fxcodec/codec/ccodec_jbig2module.h b/core/fxcodec/codec/ccodec_jbig2module.h
index e8dec945b8..b80d78f605 100644
--- a/core/fxcodec/codec/ccodec_jbig2module.h
+++ b/core/fxcodec/codec/ccodec_jbig2module.h
@@ -10,7 +10,6 @@
#include <memory>
#include "core/fxcodec/fx_codec_def.h"
-#include "core/fxcrt/cfx_unowned_ptr.h"
#include "core/fxcrt/fx_basic.h"
class CJBig2_Context;
@@ -30,7 +29,6 @@ class CCodec_Jbig2Context {
CFX_RetainPtr<CPDF_StreamAcc> m_pSrcStream;
uint8_t* m_dest_buf;
uint32_t m_dest_pitch;
- CFX_UnownedPtr<IFX_Pause> m_pPause;
std::unique_ptr<CJBig2_Context> m_pContext;
};
diff --git a/core/fxcodec/codec/fx_codec_jbig.cpp b/core/fxcodec/codec/fx_codec_jbig.cpp
index 32d030e98d..4c545c3c3a 100644
--- a/core/fxcodec/codec/fx_codec_jbig.cpp
+++ b/core/fxcodec/codec/fx_codec_jbig.cpp
@@ -33,8 +33,7 @@ CCodec_Jbig2Context::CCodec_Jbig2Context()
m_pGlobalStream(nullptr),
m_pSrcStream(nullptr),
m_dest_buf(0),
- m_dest_pitch(0),
- m_pPause(nullptr) {}
+ m_dest_pitch(0) {}
CCodec_Jbig2Context::~CCodec_Jbig2Context() {}
@@ -61,7 +60,6 @@ FXCODEC_STATUS CCodec_Jbig2Module::StartDecode(
pJbig2Context->m_pGlobalStream = global_stream;
pJbig2Context->m_dest_buf = dest_buf;
pJbig2Context->m_dest_pitch = dest_pitch;
- pJbig2Context->m_pPause = pPause;
memset(dest_buf, 0, height * dest_pitch);
pJbig2Context->m_pContext = pdfium::MakeUnique<CJBig2_Context>(
global_stream, src_stream, pJBig2DocumentContext->GetSymbolDictCache(),