Store property name for marked content with an indirect dict.

The name of the property is now stored in the CPDF_ContentMarkItem,
which will be needed to properly write back these content marks
after a change in the stream.

Bug: pdfium:1118
Change-Id: I1296f488b35ee0684efa33d17400ed22a88383a2
Reviewed-on: https://pdfium-review.googlesource.com/37370
Commit-Queue: Henrique Nakashima <hnakashima@chromium.org>
Reviewed-by: Lei Zhang <thestig@chromium.org>

1 files changed, 8 insertions, 5 deletions

diff --git a/core/fpdfapi/page/cpdf_contentmark.cpp b/core/fpdfapi/page/cpdf_contentmark.cpp
index 8b4609586d..29d1bba210 100644
--- a/core/fpdfapi/page/cpdf_contentmark.cpp
+++ b/core/fpdfapi/page/cpdf_contentmark.cpp
@@ -57,10 +57,12 @@ void CPDF_ContentMark::AddMarkWithDirectDict(ByteString name,
   m_pMarkData->AddMarkWithDirectDict(std::move(name), pDict);
 }
 
-void CPDF_ContentMark::AddMarkWithPropertiesDict(ByteString name,
-                                                 CPDF_Dictionary* pDict) {
+void CPDF_ContentMark::AddMarkWithPropertiesDict(
+    ByteString name,
+    CPDF_Dictionary* pDict,
+    const ByteString& property_name) {
   EnsureMarkDataExists();
-  m_pMarkData->AddMarkWithPropertiesDict(std::move(name), pDict);
+  m_pMarkData->AddMarkWithPropertiesDict(std::move(name), pDict, property_name);
 }
 
 void CPDF_ContentMark::EnsureMarkDataExists() {
@@ -120,9 +122,10 @@ void CPDF_ContentMark::MarkData::AddMarkWithDirectDict(ByteString name,
 
 void CPDF_ContentMark::MarkData::AddMarkWithPropertiesDict(
     ByteString name,
-    CPDF_Dictionary* pDict) {
+    CPDF_Dictionary* pDict,
+    const ByteString& property_name) {
   auto pItem = pdfium::MakeRetain<CPDF_ContentMarkItem>(std::move(name));
-  pItem->SetPropertiesDict(pDict);
+  pItem->SetPropertiesDict(pDict, property_name);
   m_Marks.push_back(pItem);
 }