From 8ac090c4a57bc27044adc7abe8143ce45388b021 Mon Sep 17 00:00:00 2001 From: Henrique Nakashima Date: Wed, 11 Jul 2018 18:58:42 +0000 Subject: Split CPDF_ContentMark::AddMark() into three versions. One version is for a mark without a dictionary. The second is for a mark with a direct dictionary. The third is for a mark with indirect properties. Bug: pdfium:1118 Change-Id: Ice0ff11d5ba4eaf2ccdf57be49b9140ba5c9b159 Reviewed-on: https://pdfium-review.googlesource.com/37550 Reviewed-by: Lei Zhang Commit-Queue: Henrique Nakashima --- core/fpdfapi/page/cpdf_contentmark.h | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'core/fpdfapi/page/cpdf_contentmark.h') diff --git a/core/fpdfapi/page/cpdf_contentmark.h b/core/fpdfapi/page/cpdf_contentmark.h index e0ae1bf549..b9b10b0a48 100644 --- a/core/fpdfapi/page/cpdf_contentmark.h +++ b/core/fpdfapi/page/cpdf_contentmark.h @@ -29,7 +29,9 @@ class CPDF_ContentMark { CPDF_ContentMarkItem* GetItem(size_t i); const CPDF_ContentMarkItem* GetItem(size_t i) const; - void AddMark(ByteString name, CPDF_Dictionary* pDict, bool bDirect); + void AddMark(ByteString name); + void AddMarkWithDirectDict(ByteString name, CPDF_Dictionary* pDict); + void AddMarkWithPropertiesDict(ByteString name, CPDF_Dictionary* pDict); void DeleteLastMark(); private: @@ -44,13 +46,17 @@ class CPDF_ContentMark { const CPDF_ContentMarkItem* GetItem(size_t index) const; int GetMarkedContentID() const; - void AddMark(ByteString name, CPDF_Dictionary* pDict, bool bDictNeedClone); + void AddMark(ByteString name); + void AddMarkWithDirectDict(ByteString name, CPDF_Dictionary* pDict); + void AddMarkWithPropertiesDict(ByteString name, CPDF_Dictionary* pDict); void DeleteLastMark(); private: std::vector> m_Marks; }; + void EnsureMarkDataExists(); + RetainPtr m_pMarkData; }; -- cgit v1.2.3