From 9fd0c630ea2225fc544949d88d1bf63acc43112e Mon Sep 17 00:00:00 2001 From: tsepez Date: Wed, 23 Nov 2016 14:34:58 -0800 Subject: Use CFX_MaybeOwned<> in CPDF_Image Review-Url: https://codereview.chromium.org/2523093003 --- core/fpdfapi/page/cpdf_image.h | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'core/fpdfapi/page/cpdf_image.h') diff --git a/core/fpdfapi/page/cpdf_image.h b/core/fpdfapi/page/cpdf_image.h index 3438e2b98e..38c7e3e728 100644 --- a/core/fpdfapi/page/cpdf_image.h +++ b/core/fpdfapi/page/cpdf_image.h @@ -10,6 +10,7 @@ #include #include "core/fpdfapi/parser/cpdf_stream.h" +#include "core/fxcrt/cfx_maybe_owned.h" #include "core/fxcrt/fx_system.h" class CFX_DIBSource; @@ -28,8 +29,8 @@ class CPDF_Image { void ConvertStreamToIndirectObject(); - CPDF_Dictionary* GetInlineDict() const { return m_pDict; } - CPDF_Stream* GetStream() const { return m_pStream; } + CPDF_Dictionary* GetInlineDict() const { return m_pDict.Get(); } + CPDF_Stream* GetStream() const { return m_pStream.Get(); } CPDF_Dictionary* GetDict() const { return m_pStream ? m_pStream->GetDict() : nullptr; } @@ -77,10 +78,8 @@ class CPDF_Image { bool m_bIsMask = false; bool m_bInterpolate = false; CPDF_Document* const m_pDocument; - CPDF_Stream* m_pStream = nullptr; - CPDF_Dictionary* m_pDict = nullptr; - std::unique_ptr m_pOwnedStream; - std::unique_ptr m_pOwnedDict; + CFX_MaybeOwned m_pStream; + CFX_MaybeOwned m_pDict; CPDF_Dictionary* m_pOC = nullptr; }; -- cgit v1.2.3