From 05aa09d3ebfd587dd8e1116b6cac8053a2944a1a Mon Sep 17 00:00:00 2001 From: Henrique Nakashima Date: Fri, 6 Jul 2018 17:38:36 +0000 Subject: Make MarkData::mMarks a vector of RetainPtr It is currently a vector of CPDF_ContentMarkItem. Copying MarkData whenever a content mark is opened or closed is inefficient since each MarkData will have copies of the same CPDF_ContentMarkItems. This CL changes the vector inside MarkData to contains only pointers to the CPDF_ContentMarkItems rather than copies of those items. More importantly, this unifies the dictionaries of each content mark. Previously, there were as many copies of those dictionaries as content marks scope changes inside the mark with parameters. Bug: pdfium:1037 Change-Id: Ia6f79b401d4e14ac07dbba81bbd97df965b77c94 Reviewed-on: https://pdfium-review.googlesource.com/37135 Commit-Queue: Henrique Nakashima Reviewed-by: Ryan Harrison --- core/fpdfapi/page/cpdf_contentmark.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'core/fpdfapi/page/cpdf_contentmark.cpp') diff --git a/core/fpdfapi/page/cpdf_contentmark.cpp b/core/fpdfapi/page/cpdf_contentmark.cpp index 0b17c2bc35..6021dc893d 100644 --- a/core/fpdfapi/page/cpdf_contentmark.cpp +++ b/core/fpdfapi/page/cpdf_contentmark.cpp @@ -72,12 +72,12 @@ size_t CPDF_ContentMark::MarkData::CountItems() const { const CPDF_ContentMarkItem& CPDF_ContentMark::MarkData::GetItem( size_t index) const { - return m_Marks[index]; + return *m_Marks[index]; } int CPDF_ContentMark::MarkData::GetMarkedContentID() const { - for (const auto& mark : m_Marks) { - const CPDF_Dictionary* pDict = mark.GetParam(); + for (const auto pMark : m_Marks) { + const CPDF_Dictionary* pDict = pMark->GetParam(); if (pDict && pDict->KeyExist("MCID")) return pDict->GetIntegerFor("MCID"); } @@ -87,15 +87,15 @@ int CPDF_ContentMark::MarkData::GetMarkedContentID() const { void CPDF_ContentMark::MarkData::AddMark(ByteString name, const CPDF_Dictionary* pDict, bool bDirect) { - CPDF_ContentMarkItem item; - item.SetName(std::move(name)); + auto pItem = pdfium::MakeRetain(); + pItem->SetName(std::move(name)); if (pDict) { if (bDirect) - item.SetDirectDict(ToDictionary(pDict->Clone())); + pItem->SetDirectDict(ToDictionary(pDict->Clone())); else - item.SetPropertiesDict(pDict); + pItem->SetPropertiesDict(pDict); } - m_Marks.push_back(std::move(item)); + m_Marks.push_back(pItem); } void CPDF_ContentMark::MarkData::DeleteLastMark() { -- cgit v1.2.3