From 0b95042db2e6dab5876abd12ce485fff0a8e08fe Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Thu, 21 Sep 2017 15:49:49 -0400 Subject: Rename CFX_RetainPtr to RetainPtr This CL renames CFX_RetainPtr to RetainPtr and places in the fxcrt namespace. Bug: pdfium:898 Change-Id: I8798a9f79cb0840d3f037e8d04937cedd742914e Reviewed-on: https://pdfium-review.googlesource.com/14616 Reviewed-by: Tom Sepez Commit-Queue: dsinclair --- core/fxcrt/cfx_seekablestreamproxy.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'core/fxcrt/cfx_seekablestreamproxy.h') diff --git a/core/fxcrt/cfx_seekablestreamproxy.h b/core/fxcrt/cfx_seekablestreamproxy.h index fc041b49b5..cadc96816d 100644 --- a/core/fxcrt/cfx_seekablestreamproxy.h +++ b/core/fxcrt/cfx_seekablestreamproxy.h @@ -9,11 +9,11 @@ #include -#include "core/fxcrt/cfx_retain_ptr.h" #include "core/fxcrt/fx_stream.h" #include "core/fxcrt/fx_system.h" +#include "core/fxcrt/retain_ptr.h" -class CFX_SeekableStreamProxy : public CFX_Retainable { +class CFX_SeekableStreamProxy : public Retainable { public: enum class From { Begin = 0, @@ -21,7 +21,7 @@ class CFX_SeekableStreamProxy : public CFX_Retainable { }; template - friend CFX_RetainPtr pdfium::MakeRetain(Args&&... args); + friend RetainPtr pdfium::MakeRetain(Args&&... args); FX_FILESIZE GetLength() const { return m_pStream->GetSize(); } FX_FILESIZE GetPosition() { return m_iPosition; } @@ -37,7 +37,7 @@ class CFX_SeekableStreamProxy : public CFX_Retainable { void SetCodePage(uint16_t wCodePage); private: - CFX_SeekableStreamProxy(const CFX_RetainPtr& stream, + CFX_SeekableStreamProxy(const RetainPtr& stream, bool isWriteSteam); CFX_SeekableStreamProxy(uint8_t* data, FX_STRSIZE size); ~CFX_SeekableStreamProxy() override; @@ -48,7 +48,7 @@ class CFX_SeekableStreamProxy : public CFX_Retainable { uint16_t m_wCodePage; FX_STRSIZE m_wBOMLength; FX_FILESIZE m_iPosition; - CFX_RetainPtr m_pStream; + RetainPtr m_pStream; }; #endif // CORE_FXCRT_CFX_SEEKABLESTREAMPROXY_H_ -- cgit v1.2.3