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/fpdfdoc/cpdf_structelement.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/fpdfdoc/cpdf_structelement.h')
-rw-r--r-- | core/fpdfdoc/cpdf_structelement.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/core/fpdfdoc/cpdf_structelement.h b/core/fpdfdoc/cpdf_structelement.h index c1e5f5001d..57f8aee2e8 100644 --- a/core/fpdfdoc/cpdf_structelement.h +++ b/core/fpdfdoc/cpdf_structelement.h @@ -9,9 +9,9 @@ #include <vector> -#include "core/fxcrt/cfx_unowned_ptr.h" #include "core/fxcrt/fx_string.h" #include "core/fxcrt/retain_ptr.h" +#include "core/fxcrt/unowned_ptr.h" #include "core/fxge/fx_dib.h" class CPDF_Dictionary; @@ -28,7 +28,7 @@ class CPDF_StructKid { enum { Invalid, Element, PageContent, StreamContent, Object } m_Type; RetainPtr<CPDF_StructElement> m_pElement; // For Element. - CFX_UnownedPtr<CPDF_Dictionary> m_pDict; // For Element. + UnownedPtr<CPDF_Dictionary> m_pDict; // For Element. uint32_t m_PageObjNum; // For PageContent, StreamContent, Object. uint32_t m_RefObjNum; // For StreamContent, Object. uint32_t m_ContentId; // For PageContent, StreamContent. @@ -56,9 +56,9 @@ class CPDF_StructElement : public Retainable { void LoadKids(CPDF_Dictionary* pDict); void LoadKid(uint32_t PageObjNum, CPDF_Object* pObj, CPDF_StructKid* pKid); - CFX_UnownedPtr<CPDF_StructTree> const m_pTree; - CFX_UnownedPtr<CPDF_StructElement> const m_pParent; - CFX_UnownedPtr<CPDF_Dictionary> const m_pDict; + UnownedPtr<CPDF_StructTree> const m_pTree; + UnownedPtr<CPDF_StructElement> const m_pParent; + UnownedPtr<CPDF_Dictionary> const m_pDict; ByteString m_Type; ByteString m_Title; std::vector<CPDF_StructKid> m_Kids; |