From 4cb82ee95256f110489f2b503e70729c44419e74 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Mon, 22 May 2017 15:15:30 -0700 Subject: Convert more c-style pointers to CFX_UnownedPtr Change-Id: I551b4210c95db0b916e9fe6cddf11e6c3d015c50 Reviewed-on: https://pdfium-review.googlesource.com/5790 Reviewed-by: Lei Zhang Commit-Queue: Tom Sepez --- core/fpdfapi/page/cpdf_generalstate.h | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'core/fpdfapi/page/cpdf_generalstate.h') diff --git a/core/fpdfapi/page/cpdf_generalstate.h b/core/fpdfapi/page/cpdf_generalstate.h index 9305785256..4ec08ca9c5 100644 --- a/core/fpdfapi/page/cpdf_generalstate.h +++ b/core/fpdfapi/page/cpdf_generalstate.h @@ -8,6 +8,7 @@ #define CORE_FPDFAPI_PAGE_CPDF_GENERALSTATE_H_ #include "core/fxcrt/cfx_shared_copy_on_write.h" +#include "core/fxcrt/cfx_unowned_ptr.h" #include "core/fxcrt/fx_basic.h" #include "core/fxcrt/fx_coordinates.h" #include "core/fxge/fx_dib.h" @@ -83,11 +84,11 @@ class CPDF_GeneralState { CFX_ByteString m_BlendMode; int m_BlendType; - CPDF_Object* m_pSoftMask; + CFX_UnownedPtr m_pSoftMask; CFX_Matrix m_SMaskMatrix; float m_StrokeAlpha; float m_FillAlpha; - CPDF_Object* m_pTR; + CFX_UnownedPtr m_pTR; CFX_RetainPtr m_pTransferFunc; CFX_Matrix m_Matrix; int m_RenderIntent; @@ -97,9 +98,9 @@ class CPDF_GeneralState { bool m_StrokeOP; bool m_FillOP; int m_OPMode; - CPDF_Object* m_pBG; - CPDF_Object* m_pUCR; - CPDF_Object* m_pHT; + CFX_UnownedPtr m_pBG; + CFX_UnownedPtr m_pUCR; + CFX_UnownedPtr m_pHT; float m_Flatness; float m_Smoothness; }; -- cgit v1.2.3