diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2017-09-21 16:53:58 -0400 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-09-21 21:25:26 +0000 |
| commit | aee0db0e6a12bdaacebeb8fb791f4e0d45e18a0d (patch) | |
| tree | 1e14d60adcffeb0791a0a6c8792d3e9c0109384e /core/fxcodec/codec | |
| parent | 8e9e3d8975eeea3429c3b3ea703f04ac34e20e28 (diff) | |
| download | pdfium-aee0db0e6a12bdaacebeb8fb791f4e0d45e18a0d.tar.xz | |
Move CFX_UnownedPtr to UnownedPtr
This CL moves CFX_UnownedPtr to UnownedPtr and places in the fxcrt
namespace.
Bug: pdfium:898
Change-Id: I6d1fa463f365e5cb3aafa8c8a7a5f7eff62ed8e0
Reviewed-on: https://pdfium-review.googlesource.com/14620
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'core/fxcodec/codec')
| -rw-r--r-- | core/fxcodec/codec/ccodec_bmpmodule.cpp | 2 | ||||
| -rw-r--r-- | core/fxcodec/codec/ccodec_bmpmodule.h | 2 | ||||
| -rw-r--r-- | core/fxcodec/codec/ccodec_pngmodule.cpp | 6 | ||||
| -rw-r--r-- | core/fxcodec/codec/ccodec_progressivedecoder.h | 4 | ||||
| -rw-r--r-- | core/fxcodec/codec/cjpx_decoder.h | 4 |
5 files changed, 9 insertions, 9 deletions
diff --git a/core/fxcodec/codec/ccodec_bmpmodule.cpp b/core/fxcodec/codec/ccodec_bmpmodule.cpp index a64e6783e1..a76cc3c6f7 100644 --- a/core/fxcodec/codec/ccodec_bmpmodule.cpp +++ b/core/fxcodec/codec/ccodec_bmpmodule.cpp @@ -9,7 +9,7 @@ #include "core/fxcodec/codec/codec_int.h" #include "core/fxcodec/fx_codec.h" #include "core/fxcodec/lbmp/fx_bmp.h" -#include "core/fxcrt/cfx_unowned_ptr.h" +#include "core/fxcrt/unowned_ptr.h" #include "core/fxge/fx_dib.h" #include "third_party/base/ptr_util.h" diff --git a/core/fxcodec/codec/ccodec_bmpmodule.h b/core/fxcodec/codec/ccodec_bmpmodule.h index e9ad7c3001..8a33f66eac 100644 --- a/core/fxcodec/codec/ccodec_bmpmodule.h +++ b/core/fxcodec/codec/ccodec_bmpmodule.h @@ -10,8 +10,8 @@ #include <memory> #include <vector> -#include "core/fxcrt/cfx_unowned_ptr.h" #include "core/fxcrt/fx_system.h" +#include "core/fxcrt/unowned_ptr.h" class CFX_DIBAttribute; diff --git a/core/fxcodec/codec/ccodec_pngmodule.cpp b/core/fxcodec/codec/ccodec_pngmodule.cpp index ae70389ced..a08e72f86d 100644 --- a/core/fxcodec/codec/ccodec_pngmodule.cpp +++ b/core/fxcodec/codec/ccodec_pngmodule.cpp @@ -10,7 +10,7 @@ #include "core/fxcodec/codec/codec_int.h" #include "core/fxcodec/fx_codec.h" -#include "core/fxcrt/cfx_unowned_ptr.h" +#include "core/fxcrt/unowned_ptr.h" #include "core/fxge/fx_dib.h" #include "third_party/base/ptr_util.h" @@ -28,8 +28,8 @@ class CPngContext : public CCodec_PngModule::Context { png_structp m_pPng; png_infop m_pInfo; - CFX_UnownedPtr<CCodec_PngModule> m_pModule; - CFX_UnownedPtr<CCodec_PngModule::Delegate> m_pDelegate; + UnownedPtr<CCodec_PngModule> m_pModule; + UnownedPtr<CCodec_PngModule::Delegate> m_pDelegate; void* (*m_AllocFunc)(unsigned int); void (*m_FreeFunc)(void*); char m_szLastError[PNG_ERROR_SIZE]; diff --git a/core/fxcodec/codec/ccodec_progressivedecoder.h b/core/fxcodec/codec/ccodec_progressivedecoder.h index 3ce19402d2..87bed08fcf 100644 --- a/core/fxcodec/codec/ccodec_progressivedecoder.h +++ b/core/fxcodec/codec/ccodec_progressivedecoder.h @@ -16,9 +16,9 @@ #include "core/fxcodec/codec/ccodec_pngmodule.h" #include "core/fxcodec/codec/ccodec_tiffmodule.h" #include "core/fxcodec/fx_codec_def.h" -#include "core/fxcrt/cfx_unowned_ptr.h" #include "core/fxcrt/fx_system.h" #include "core/fxcrt/retain_ptr.h" +#include "core/fxcrt/unowned_ptr.h" #include "core/fxge/fx_dib.h" class CCodec_ModuleMgr; @@ -187,7 +187,7 @@ class CCodec_ProgressiveDecoder : public CCodec_BmpModule::Delegate, RetainPtr<IFX_SeekableReadStream> m_pFile; RetainPtr<CFX_DIBitmap> m_pDeviceBitmap; - CFX_UnownedPtr<CCodec_ModuleMgr> m_pCodecMgr; + UnownedPtr<CCodec_ModuleMgr> m_pCodecMgr; std::unique_ptr<CCodec_JpegModule::Context> m_pJpegContext; std::unique_ptr<CCodec_PngModule::Context> m_pPngContext; std::unique_ptr<CCodec_GifModule::Context> m_pGifContext; diff --git a/core/fxcodec/codec/cjpx_decoder.h b/core/fxcodec/codec/cjpx_decoder.h index 9e6c79cafc..c68969301c 100644 --- a/core/fxcodec/codec/cjpx_decoder.h +++ b/core/fxcodec/codec/cjpx_decoder.h @@ -11,7 +11,7 @@ #include <vector> #include "core/fxcodec/codec/codec_int.h" -#include "core/fxcrt/cfx_unowned_ptr.h" +#include "core/fxcrt/unowned_ptr.h" #include "third_party/libopenjpeg20/openjpeg.h" class CPDF_ColorSpace; @@ -36,7 +36,7 @@ class CJPX_Decoder { std::unique_ptr<DecodeData> m_DecodeData; opj_stream_t* m_Stream; opj_dparameters_t m_Parameters; - CFX_UnownedPtr<const CPDF_ColorSpace> const m_ColorSpace; + UnownedPtr<const CPDF_ColorSpace> const m_ColorSpace; }; #endif // CORE_FXCODEC_CODEC_CJPX_DECODER_H_ |