diff options
author | Henrique Nakashima <hnakashima@chromium.org> | 2018-07-05 17:13:28 +0000 |
---|---|---|
committer | Chromium commit bot <commit-bot@chromium.org> | 2018-07-05 17:13:28 +0000 |
commit | 6f0d8ea78adbb7f5d93e2470a6888b5417a01bca (patch) | |
tree | 2d70c70b33b5937d924b10a8533a8a2e8c18caa7 | |
parent | 6c4ca9f597ae84550e0b8a4323e44b188f9bb274 (diff) | |
download | pdfium-6f0d8ea78adbb7f5d93e2470a6888b5417a01bca.tar.xz |
Rename CPDF_ContentMark::m_Ref to ::m_pMarkData.
Bug: pdfium:1037
Change-Id: I94efc14ce5f8d0d407853cce025f0184b3866cc4
Reviewed-on: https://pdfium-review.googlesource.com/37134
Commit-Queue: Henrique Nakashima <hnakashima@chromium.org>
Reviewed-by: Ryan Harrison <rharrison@chromium.org>
-rw-r--r-- | core/fpdfapi/page/cpdf_contentmark.cpp | 26 | ||||
-rw-r--r-- | core/fpdfapi/page/cpdf_contentmark.h | 2 |
2 files changed, 14 insertions, 14 deletions
diff --git a/core/fpdfapi/page/cpdf_contentmark.cpp b/core/fpdfapi/page/cpdf_contentmark.cpp index a4bb15ed9a..0b17c2bc35 100644 --- a/core/fpdfapi/page/cpdf_contentmark.cpp +++ b/core/fpdfapi/page/cpdf_contentmark.cpp @@ -16,47 +16,47 @@ CPDF_ContentMark::~CPDF_ContentMark() {} std::unique_ptr<CPDF_ContentMark> CPDF_ContentMark::Clone() { auto result = pdfium::MakeUnique<CPDF_ContentMark>(); - if (m_Ref) - result->m_Ref.Reset(new MarkData(*m_Ref)); + if (m_pMarkData) + result->m_pMarkData.Reset(new MarkData(*m_pMarkData)); return result; } size_t CPDF_ContentMark::CountItems() const { - if (!m_Ref) + if (!m_pMarkData) return 0; - return m_Ref->CountItems(); + return m_pMarkData->CountItems(); } const CPDF_ContentMarkItem& CPDF_ContentMark::GetItem(size_t i) const { ASSERT(i < CountItems()); - return m_Ref->GetItem(i); + return m_pMarkData->GetItem(i); } int CPDF_ContentMark::GetMarkedContentID() const { - if (!m_Ref) + if (!m_pMarkData) return -1; - return m_Ref->GetMarkedContentID(); + return m_pMarkData->GetMarkedContentID(); } void CPDF_ContentMark::AddMark(ByteString name, const CPDF_Dictionary* pDict, bool bDirect) { - if (!m_Ref) - m_Ref.Reset(new MarkData()); + if (!m_pMarkData) + m_pMarkData.Reset(new MarkData()); - m_Ref->AddMark(std::move(name), pDict, bDirect); + m_pMarkData->AddMark(std::move(name), pDict, bDirect); } void CPDF_ContentMark::DeleteLastMark() { - if (!m_Ref) + if (!m_pMarkData) return; - m_Ref->DeleteLastMark(); + m_pMarkData->DeleteLastMark(); if (CountItems() == 0) - m_Ref.Reset(); + m_pMarkData.Reset(); } CPDF_ContentMark::MarkData::MarkData() {} diff --git a/core/fpdfapi/page/cpdf_contentmark.h b/core/fpdfapi/page/cpdf_contentmark.h index 6012350398..27116afeef 100644 --- a/core/fpdfapi/page/cpdf_contentmark.h +++ b/core/fpdfapi/page/cpdf_contentmark.h @@ -49,7 +49,7 @@ class CPDF_ContentMark { std::vector<CPDF_ContentMarkItem> m_Marks; }; - RetainPtr<MarkData> m_Ref; + RetainPtr<MarkData> m_pMarkData; }; #endif // CORE_FPDFAPI_PAGE_CPDF_CONTENTMARK_H_ |