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/parser/cpdf_dictionary.h | |
| 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/parser/cpdf_dictionary.h')
| -rw-r--r-- | core/fpdfapi/parser/cpdf_dictionary.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/core/fpdfapi/parser/cpdf_dictionary.h b/core/fpdfapi/parser/cpdf_dictionary.h index a9ff353fbe..688e88e510 100644 --- a/core/fpdfapi/parser/cpdf_dictionary.h +++ b/core/fpdfapi/parser/cpdf_dictionary.h @@ -13,10 +13,10 @@ #include <utility> #include "core/fpdfapi/parser/cpdf_object.h" -#include "core/fxcrt/cfx_weak_ptr.h" #include "core/fxcrt/fx_coordinates.h" #include "core/fxcrt/fx_string.h" #include "core/fxcrt/string_pool_template.h" +#include "core/fxcrt/weak_ptr.h" #include "third_party/base/ptr_util.h" class CPDF_IndirectObjectHolder; @@ -27,7 +27,7 @@ class CPDF_Dictionary : public CPDF_Object { std::map<ByteString, std::unique_ptr<CPDF_Object>>::const_iterator; CPDF_Dictionary(); - explicit CPDF_Dictionary(const CFX_WeakPtr<ByteStringPool>& pPool); + explicit CPDF_Dictionary(const WeakPtr<ByteStringPool>& pPool); ~CPDF_Dictionary() override; // CPDF_Object: @@ -97,7 +97,7 @@ class CPDF_Dictionary : public CPDF_Object { const_iterator begin() const { return m_Map.begin(); } const_iterator end() const { return m_Map.end(); } - CFX_WeakPtr<ByteStringPool> GetByteStringPool() const { return m_pPool; } + WeakPtr<ByteStringPool> GetByteStringPool() const { return m_pPool; } protected: ByteString MaybeIntern(const ByteString& str); @@ -105,7 +105,7 @@ class CPDF_Dictionary : public CPDF_Object { bool bDirect, std::set<const CPDF_Object*>* visited) const override; - CFX_WeakPtr<ByteStringPool> m_pPool; + WeakPtr<ByteStringPool> m_pPool; std::map<ByteString, std::unique_ptr<CPDF_Object>> m_Map; }; |