From 033e565d8244953afe8eab3d0c7ee1ed9863c921 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Tue, 23 May 2017 16:18:28 -0700 Subject: Convert to CFX_UnownedPtr, part 5 Change-Id: Ibdb20fca7e4daae9d61286df4801ac02faf3b281 Reviewed-on: https://pdfium-review.googlesource.com/5831 Commit-Queue: Lei Zhang Reviewed-by: Lei Zhang --- core/fpdftext/cpdf_textpage.h | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'core/fpdftext/cpdf_textpage.h') diff --git a/core/fpdftext/cpdf_textpage.h b/core/fpdftext/cpdf_textpage.h index d7e29edf3b..a18310667d 100644 --- a/core/fpdftext/cpdf_textpage.h +++ b/core/fpdftext/cpdf_textpage.h @@ -11,6 +11,7 @@ #include #include "core/fpdfapi/page/cpdf_pageobjectlist.h" +#include "core/fxcrt/cfx_unowned_ptr.h" #include "core/fxcrt/fx_basic.h" #include "core/fxcrt/fx_coordinates.h" #include "core/fxcrt/fx_string.h" @@ -57,7 +58,7 @@ class FPDF_CHAR_INFO { float m_FontSize; CFX_PointF m_Origin; CFX_FloatRect m_CharBox; - CPDF_TextObject* m_pTextObj; + CFX_UnownedPtr m_pTextObj; CFX_Matrix m_Matrix; }; @@ -78,7 +79,7 @@ class PAGECHAR_INFO { int32_t m_Flag; CFX_PointF m_Origin; CFX_FloatRect m_CharBox; - CPDF_TextObject* m_pTextObj; + CFX_UnownedPtr m_pTextObj; CFX_Matrix m_Matrix; }; @@ -162,14 +163,14 @@ class CPDF_TextPage { const CPDF_Font* pFont, int nItems) const; - const CPDF_Page* const m_pPage; + CFX_UnownedPtr const m_pPage; std::vector m_CharIndex; std::deque m_CharList; std::deque m_TempCharList; CFX_WideTextBuf m_TextBuf; CFX_WideTextBuf m_TempTextBuf; const FPDFText_Direction m_parserflag; - CPDF_TextObject* m_pPreTextObj; + CFX_UnownedPtr m_pPreTextObj; CFX_Matrix m_perMatrix; bool m_bIsParsed; CFX_Matrix m_DisplayMatrix; -- cgit v1.2.3