diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2017-09-21 17:05:15 -0400 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-09-21 21:38:37 +0000 |
| commit | b872a93e5cd940dc28ad960b13b0cf01a6db3400 (patch) | |
| tree | 057208e10b41e1cc3c2ac1b782af9394aadbe87d /core/fpdfapi/page | |
| parent | aee0db0e6a12bdaacebeb8fb791f4e0d45e18a0d (diff) | |
| download | pdfium-b872a93e5cd940dc28ad960b13b0cf01a6db3400.tar.xz | |
Move CFX_WeakPtr to WeakPtr
This CL renames CFX_WeakPtr to WeakPtr and moves into the fxcrt
namespace.
Bug: pdfium:898
Change-Id: Ide50a8afeb1e987c48c8fbd103898745c9199d6a
Reviewed-on: https://pdfium-review.googlesource.com/14621
Commit-Queue: dsinclair <dsinclair@chromium.org>
Commit-Queue: Tom Sepez <tsepez@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Diffstat (limited to 'core/fpdfapi/page')
| -rw-r--r-- | core/fpdfapi/page/cpdf_streamparser.cpp | 2 | ||||
| -rw-r--r-- | core/fpdfapi/page/cpdf_streamparser.h | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/core/fpdfapi/page/cpdf_streamparser.cpp b/core/fpdfapi/page/cpdf_streamparser.cpp index ffd76005e0..e9320cbc6f 100644 --- a/core/fpdfapi/page/cpdf_streamparser.cpp +++ b/core/fpdfapi/page/cpdf_streamparser.cpp @@ -107,7 +107,7 @@ CPDF_StreamParser::CPDF_StreamParser(const uint8_t* pData, uint32_t dwSize) CPDF_StreamParser::CPDF_StreamParser(const uint8_t* pData, uint32_t dwSize, - const CFX_WeakPtr<ByteStringPool>& pPool) + const WeakPtr<ByteStringPool>& pPool) : m_pBuf(pData), m_Size(dwSize), m_Pos(0), m_pPool(pPool) {} CPDF_StreamParser::~CPDF_StreamParser() {} diff --git a/core/fpdfapi/page/cpdf_streamparser.h b/core/fpdfapi/page/cpdf_streamparser.h index 53d5dfd135..158726b026 100644 --- a/core/fpdfapi/page/cpdf_streamparser.h +++ b/core/fpdfapi/page/cpdf_streamparser.h @@ -14,8 +14,8 @@ #include "core/fpdfapi/parser/cpdf_document.h" #include "core/fpdfapi/parser/cpdf_object.h" #include "core/fpdfapi/parser/cpdf_stream.h" -#include "core/fxcrt/cfx_weak_ptr.h" #include "core/fxcrt/string_pool_template.h" +#include "core/fxcrt/weak_ptr.h" class CPDF_StreamParser { public: @@ -24,7 +24,7 @@ class CPDF_StreamParser { CPDF_StreamParser(const uint8_t* pData, uint32_t dwSize); CPDF_StreamParser(const uint8_t* pData, uint32_t dwSize, - const CFX_WeakPtr<ByteStringPool>& pPool); + const WeakPtr<ByteStringPool>& pPool); ~CPDF_StreamParser(); SyntaxType ParseNextElement(); @@ -56,7 +56,7 @@ class CPDF_StreamParser { uint8_t m_WordBuffer[256]; uint32_t m_WordSize; std::unique_ptr<CPDF_Object> m_pLastObj; - CFX_WeakPtr<ByteStringPool> m_pPool; + WeakPtr<ByteStringPool> m_pPool; }; #endif // CORE_FPDFAPI_PAGE_CPDF_STREAMPARSER_H_ |