diff options
| author | Tom Sepez <tsepez@chromium.org> | 2017-05-22 15:15:30 -0700 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-05-22 23:44:01 +0000 |
| commit | 4cb82ee95256f110489f2b503e70729c44419e74 (patch) | |
| tree | 56d11efe9bd8e93af2145c02f4f3c84ea3954f55 /core/fpdfapi/page/cpdf_streamcontentparser.h | |
| parent | 355954b8f09a65934b95dd6ca1299a73ae5e24b2 (diff) | |
| download | pdfium-4cb82ee95256f110489f2b503e70729c44419e74.tar.xz | |
Convert more c-style pointers to CFX_UnownedPtr
Change-Id: I551b4210c95db0b916e9fe6cddf11e6c3d015c50
Reviewed-on: https://pdfium-review.googlesource.com/5790
Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Tom Sepez <tsepez@chromium.org>
Diffstat (limited to 'core/fpdfapi/page/cpdf_streamcontentparser.h')
| -rw-r--r-- | core/fpdfapi/page/cpdf_streamcontentparser.h | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/core/fpdfapi/page/cpdf_streamcontentparser.h b/core/fpdfapi/page/cpdf_streamcontentparser.h index 50eb0eb63a..5436f8f8c6 100644 --- a/core/fpdfapi/page/cpdf_streamcontentparser.h +++ b/core/fpdfapi/page/cpdf_streamcontentparser.h @@ -43,7 +43,9 @@ class CPDF_StreamContentParser { ~CPDF_StreamContentParser(); uint32_t Parse(const uint8_t* pData, uint32_t dwSize, uint32_t max_cost); - CPDF_PageObjectHolder* GetPageObjectHolder() const { return m_pObjectHolder; } + CPDF_PageObjectHolder* GetPageObjectHolder() const { + return m_pObjectHolder.Get(); + } CPDF_AllStates* GetCurStates() const { return m_pCurStates.get(); } bool IsColored() const { return m_bColored; } const float* GetType3Data() const { return m_Type3Data; } @@ -186,11 +188,11 @@ class CPDF_StreamContentParser { void Handle_NextLineShowText_Space(); void Handle_Invalid(); - CPDF_Document* const m_pDocument; - CPDF_Dictionary* m_pPageResources; - CPDF_Dictionary* m_pParentResources; - CPDF_Dictionary* m_pResources; - CPDF_PageObjectHolder* m_pObjectHolder; + CFX_UnownedPtr<CPDF_Document> const m_pDocument; + CFX_UnownedPtr<CPDF_Dictionary> m_pPageResources; + CFX_UnownedPtr<CPDF_Dictionary> m_pParentResources; + CFX_UnownedPtr<CPDF_Dictionary> m_pResources; + CFX_UnownedPtr<CPDF_PageObjectHolder> m_pObjectHolder; int m_Level; CFX_Matrix m_mtContentToUser; CFX_FloatRect m_BBox; @@ -201,7 +203,7 @@ class CPDF_StreamContentParser { std::unique_ptr<CPDF_AllStates> m_pCurStates; CPDF_ContentMark m_CurContentMark; std::vector<std::unique_ptr<CPDF_TextObject>> m_ClipTextList; - CPDF_TextObject* m_pLastTextObject; + CFX_UnownedPtr<CPDF_TextObject> m_pLastTextObject; float m_DefFontSize; std::vector<FX_PATHPOINT> m_PathPoints; float m_PathStartX; |