commit e6dba0dcc2c399e92b2ed7029a5241726f38938f
author Lei Zhang <thestig@chromium.org> Wed Nov 22 20:04:13 2017 +0000
committer Chromium commit bot <commit-bot@chromium.org> Wed Nov 22 20:04:13 2017 +0000
tree 995af506b01db9595c2a3ac3bd1a4cf1d914ab77
parent fe2cd4d914205f2da91286e7270209e2016d51a1

Remove dead CPDF_ContentMark code.

Change-Id: Ic552a652856ca231f3d2077c76a20d5916adb3c1
Reviewed-on: https://pdfium-review.googlesource.com/19170
Reviewed-by: dsinclair <dsinclair@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>

core/fpdfapi/page/cpdf_contentmark.cpp

diff --git a/core/fpdfapi/page/cpdf_contentmark.cpp b/core/fpdfapi/page/cpdf_contentmark.cpp
index cf8e37e..b28d4ea 100644
--- a/core/fpdfapi/page/cpdf_contentmark.cpp
+++ b/core/fpdfapi/page/cpdf_contentmark.cpp
@@ -6,7 +6,6 @@
 
 #include "core/fpdfapi/page/cpdf_contentmark.h"
 
-#include <memory>
 #include <utility>
 
 #include "core/fpdfapi/parser/cpdf_dictionary.h"
@@ -19,10 +18,6 @@
 
 CPDF_ContentMark::~CPDF_ContentMark() {}
 
-void CPDF_ContentMark::SetNull() {
-  m_Ref.SetNull();
-}
-
 int CPDF_ContentMark::CountItems() const {
   return m_Ref.GetObject()->CountItems();
 }
@@ -31,11 +26,6 @@
   return m_Ref.GetObject()->GetItem(i);
 }
 
-int CPDF_ContentMark::GetMCID() const {
-  const MarkData* pData = m_Ref.GetObject();
-  return pData ? pData->GetMCID() : -1;
-}
-
 void CPDF_ContentMark::AddMark(const ByteString& name,
                                CPDF_Dictionary* pDict,
                                bool bDirect) {
@@ -48,34 +38,6 @@
     m_Ref.SetNull();
 }
 
-bool CPDF_ContentMark::HasMark(const ByteStringView& mark) const {
-  const MarkData* pData = m_Ref.GetObject();
-  if (!pData)
-    return false;
-
-  for (int i = 0; i < pData->CountItems(); i++) {
-    if (pData->GetItem(i).GetName() == mark)
-      return true;
-  }
-  return false;
-}
-
-bool CPDF_ContentMark::LookupMark(const ByteStringView& mark,
-                                  CPDF_Dictionary** pDict) const {
-  const MarkData* pData = m_Ref.GetObject();
-  if (!pData)
-    return false;
-
-  for (int i = 0; i < pData->CountItems(); i++) {
-    const CPDF_ContentMarkItem& item = pData->GetItem(i);
-    if (item.GetName() == mark) {
-      *pDict = item.GetParam();
-      return true;
-    }
-  }
-  return false;
-}
-
 CPDF_ContentMark::MarkData::MarkData() {}
 
 CPDF_ContentMark::MarkData::MarkData(const MarkData& src)
@@ -87,36 +49,21 @@
   return pdfium::CollectionSize<int>(m_Marks);
 }
 
-CPDF_ContentMarkItem& CPDF_ContentMark::MarkData::GetItem(int index) {
-  return m_Marks[index];
-}
-
 const CPDF_ContentMarkItem& CPDF_ContentMark::MarkData::GetItem(
     int index) const {
   return m_Marks[index];
 }
 
-int CPDF_ContentMark::MarkData::GetMCID() const {
-  for (const auto& mark : m_Marks) {
-    CPDF_Dictionary* pDict = mark.GetParam();
-    if (pDict && pDict->KeyExist("MCID"))
-      return pDict->GetIntegerFor("MCID");
-  }
-  return -1;
-}
-
 void CPDF_ContentMark::MarkData::AddMark(const ByteString& name,
                                          CPDF_Dictionary* pDict,
                                          bool bDirect) {
   CPDF_ContentMarkItem item;
   item.SetName(name);
   if (pDict) {
-    if (bDirect) {
-      item.SetDirectDict(
-          std::unique_ptr<CPDF_Dictionary>(ToDictionary(pDict->Clone())));
-    } else {
+    if (bDirect)
+      item.SetDirectDict(ToDictionary(pDict->Clone()));
+    else
       item.SetPropertiesDict(pDict);
-    }
   }
   m_Marks.push_back(std::move(item));
 }

core/fpdfapi/page/cpdf_contentmark.h

diff --git a/core/fpdfapi/page/cpdf_contentmark.h b/core/fpdfapi/page/cpdf_contentmark.h
index 9619b12..f9a8910 100644
--- a/core/fpdfapi/page/cpdf_contentmark.h
+++ b/core/fpdfapi/page/cpdf_contentmark.h
@@ -21,14 +21,9 @@
   CPDF_ContentMark(const CPDF_ContentMark& that);
   ~CPDF_ContentMark();
 
-  void SetNull();
-
-  int GetMCID() const;
   int CountItems() const;
   const CPDF_ContentMarkItem& GetItem(int i) const;
 
-  bool HasMark(const ByteStringView& mark) const;
-  bool LookupMark(const ByteStringView& mark, CPDF_Dictionary** pDict) const;
   void AddMark(const ByteString& name, CPDF_Dictionary* pDict, bool bDirect);
   void DeleteLastMark();
 
@@ -42,10 +37,8 @@
     ~MarkData();
 
     int CountItems() const;
-    CPDF_ContentMarkItem& GetItem(int index);
     const CPDF_ContentMarkItem& GetItem(int index) const;
 
-    int GetMCID() const;
     void AddMark(const ByteString& name,
                  CPDF_Dictionary* pDict,
                  bool bDictNeedClone);