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/fpdfapi/render/cpdf_dibsource.h | |
| 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/fpdfapi/render/cpdf_dibsource.h')
| -rw-r--r-- | core/fpdfapi/render/cpdf_dibsource.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/core/fpdfapi/render/cpdf_dibsource.h b/core/fpdfapi/render/cpdf_dibsource.h index 08c4afe862..dd7dd4fc02 100644 --- a/core/fpdfapi/render/cpdf_dibsource.h +++ b/core/fpdfapi/render/cpdf_dibsource.h @@ -18,8 +18,8 @@ #include "core/fpdfapi/render/cpdf_imageloader.h" #include "core/fpdfapi/render/cpdf_rendercontext.h" #include "core/fpdfapi/render/cpdf_renderoptions.h" -#include "core/fxcrt/cfx_unowned_ptr.h" #include "core/fxcrt/retain_ptr.h" +#include "core/fxcrt/unowned_ptr.h" #include "core/fxge/cfx_defaultrenderdevice.h" #include "core/fxge/cfx_renderdevice.h" @@ -122,9 +122,9 @@ class CPDF_DIBSource : public CFX_DIBSource { int clip_width) const; bool TransMask() const; - CFX_UnownedPtr<CPDF_Document> m_pDocument; - CFX_UnownedPtr<const CPDF_Stream> m_pStream; - CFX_UnownedPtr<const CPDF_Dictionary> m_pDict; + UnownedPtr<CPDF_Document> m_pDocument; + UnownedPtr<const CPDF_Stream> m_pStream; + UnownedPtr<const CPDF_Dictionary> m_pDict; RetainPtr<CPDF_StreamAcc> m_pStreamAcc; CPDF_ColorSpace* m_pColorSpace; uint32_t m_Family; @@ -148,7 +148,7 @@ class CPDF_DIBSource : public CFX_DIBSource { RetainPtr<CPDF_StreamAcc> m_pGlobalStream; std::unique_ptr<CCodec_ScanlineDecoder> m_pDecoder; std::unique_ptr<CCodec_Jbig2Context> m_pJbig2Context; - CFX_UnownedPtr<CPDF_Stream> m_pMaskStream; + UnownedPtr<CPDF_Stream> m_pMaskStream; int m_Status; }; |