From a9caab94c1f16929e5acf2676117224617d80f53 Mon Sep 17 00:00:00 2001 From: tsepez Date: Wed, 14 Dec 2016 05:57:10 -0800 Subject: Avoid the ptr.reset(new XXX()) anti-pattern Be suspicious of |new|. This removes some of the easy cases. Review-Url: https://codereview.chromium.org/2571913002 --- core/fxcodec/codec/fx_codec_jbig.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'core/fxcodec/codec/fx_codec_jbig.cpp') diff --git a/core/fxcodec/codec/fx_codec_jbig.cpp b/core/fxcodec/codec/fx_codec_jbig.cpp index 8d20894231..926541f07d 100644 --- a/core/fxcodec/codec/fx_codec_jbig.cpp +++ b/core/fxcodec/codec/fx_codec_jbig.cpp @@ -14,6 +14,7 @@ #include "core/fxcodec/jbig2/JBig2_Context.h" #include "core/fxcodec/jbig2/JBig2_Image.h" #include "core/fxcrt/fx_memory.h" +#include "third_party/base/ptr_util.h" JBig2_DocumentContext::JBig2_DocumentContext() {} @@ -22,7 +23,7 @@ JBig2_DocumentContext::~JBig2_DocumentContext() {} JBig2_DocumentContext* GetJBig2DocumentContext( std::unique_ptr* pContextHolder) { if (!pContextHolder->get()) - pContextHolder->reset(new JBig2_DocumentContext()); + *pContextHolder = pdfium::MakeUnique(); return pContextHolder->get(); } @@ -62,9 +63,9 @@ FXCODEC_STATUS CCodec_Jbig2Module::StartDecode( pJbig2Context->m_dest_pitch = dest_pitch; pJbig2Context->m_pPause = pPause; FXSYS_memset(dest_buf, 0, height * dest_pitch); - pJbig2Context->m_pContext.reset(new CJBig2_Context( + pJbig2Context->m_pContext = pdfium::MakeUnique( global_stream, src_stream, pJBig2DocumentContext->GetSymbolDictCache(), - pPause, false)); + pPause, false); if (!pJbig2Context->m_pContext) return FXCODEC_STATUS_ERROR; -- cgit v1.2.3