From dbf13f6562a902df17f6e543d3be844ca82956e2 Mon Sep 17 00:00:00 2001
From: Lei Zhang <thestig@chromium.org>
Date: Thu, 24 May 2018 01:36:40 +0000
Subject: Improve constness for more CPDF_Objects pointers.

Most of them can be marked const. A couple are marked non-const because
eventually something inside gets modified.

Change-Id: I5415ca8d1efdac451cde340272436cd1e6ec433f
Reviewed-on: https://pdfium-review.googlesource.com/32184
Commit-Queue: Lei Zhang <thestig@chromium.org>
Reviewed-by: Henrique Nakashima <hnakashima@chromium.org>
---
 core/fpdfdoc/cpdf_aaction.cpp                   | 2 +-
 core/fpdfdoc/cpdf_aaction.h                     | 6 +++---
 core/fpdfdoc/cpdf_iconfit.cpp                   | 2 +-
 core/fxcrt/cfx_seekablemultistream.cpp          | 4 ++--
 core/fxcrt/cfx_seekablemultistream.h            | 3 ++-
 core/fxcrt/cfx_seekablemultistream_unittest.cpp | 6 +++---
 6 files changed, 12 insertions(+), 11 deletions(-)

(limited to 'core')

diff --git a/core/fpdfdoc/cpdf_aaction.cpp b/core/fpdfdoc/cpdf_aaction.cpp
index 2628ca009e..9a95340114 100644
--- a/core/fpdfdoc/cpdf_aaction.cpp
+++ b/core/fpdfdoc/cpdf_aaction.cpp
@@ -38,7 +38,7 @@ static_assert(FX_ArraySize(g_sAATypes) == CPDF_AAction::NumberOfActions,
 
 }  // namespace
 
-CPDF_AAction::CPDF_AAction(CPDF_Dictionary* pDict) : m_pDict(pDict) {}
+CPDF_AAction::CPDF_AAction(const CPDF_Dictionary* pDict) : m_pDict(pDict) {}
 
 CPDF_AAction::CPDF_AAction(const CPDF_AAction& that) = default;
 
diff --git a/core/fpdfdoc/cpdf_aaction.h b/core/fpdfdoc/cpdf_aaction.h
index a5b0d25525..11eca01f8f 100644
--- a/core/fpdfdoc/cpdf_aaction.h
+++ b/core/fpdfdoc/cpdf_aaction.h
@@ -38,16 +38,16 @@ class CPDF_AAction {
     NumberOfActions  // Must be last.
   };
 
-  explicit CPDF_AAction(CPDF_Dictionary* pDict);
+  explicit CPDF_AAction(const CPDF_Dictionary* pDict);
   CPDF_AAction(const CPDF_AAction& that);
   ~CPDF_AAction();
 
   bool ActionExist(AActionType eType) const;
   CPDF_Action GetAction(AActionType eType) const;
-  CPDF_Dictionary* GetDict() const { return m_pDict.Get(); }
+  const CPDF_Dictionary* GetDict() const { return m_pDict.Get(); }
 
  private:
-  UnownedPtr<CPDF_Dictionary> const m_pDict;
+  UnownedPtr<const CPDF_Dictionary> const m_pDict;
 };
 
 #endif  // CORE_FPDFDOC_CPDF_AACTION_H_
diff --git a/core/fpdfdoc/cpdf_iconfit.cpp b/core/fpdfdoc/cpdf_iconfit.cpp
index 20ed963e92..5b3deee93f 100644
--- a/core/fpdfdoc/cpdf_iconfit.cpp
+++ b/core/fpdfdoc/cpdf_iconfit.cpp
@@ -39,7 +39,7 @@ void CPDF_IconFit::GetIconPosition(float& fLeft, float& fBottom) {
   if (!m_pDict)
     return;
 
-  CPDF_Array* pA = m_pDict->GetArrayFor("A");
+  const CPDF_Array* pA = m_pDict->GetArrayFor("A");
   if (pA) {
     uint32_t dwCount = pA->GetCount();
     if (dwCount > 0)
diff --git a/core/fxcrt/cfx_seekablemultistream.cpp b/core/fxcrt/cfx_seekablemultistream.cpp
index 92286b1939..24a29ee425 100644
--- a/core/fxcrt/cfx_seekablemultistream.cpp
+++ b/core/fxcrt/cfx_seekablemultistream.cpp
@@ -13,8 +13,8 @@
 #include "third_party/base/stl_util.h"
 
 CFX_SeekableMultiStream::CFX_SeekableMultiStream(
-    const std::vector<CPDF_Stream*>& streams) {
-  for (CPDF_Stream* pStream : streams) {
+    const std::vector<const CPDF_Stream*>& streams) {
+  for (const CPDF_Stream* pStream : streams) {
     m_Data.push_back(pdfium::MakeRetain<CPDF_StreamAcc>(pStream));
     m_Data.back()->LoadAllDataFiltered();
   }
diff --git a/core/fxcrt/cfx_seekablemultistream.h b/core/fxcrt/cfx_seekablemultistream.h
index 9138d7c321..4bd26b9863 100644
--- a/core/fxcrt/cfx_seekablemultistream.h
+++ b/core/fxcrt/cfx_seekablemultistream.h
@@ -17,7 +17,8 @@ class CPDF_StreamAcc;
 
 class CFX_SeekableMultiStream : public IFX_SeekableStream {
  public:
-  explicit CFX_SeekableMultiStream(const std::vector<CPDF_Stream*>& streams);
+  explicit CFX_SeekableMultiStream(
+      const std::vector<const CPDF_Stream*>& streams);
   ~CFX_SeekableMultiStream() override;
 
   // IFX_SeekableReadStream
diff --git a/core/fxcrt/cfx_seekablemultistream_unittest.cpp b/core/fxcrt/cfx_seekablemultistream_unittest.cpp
index 89213b13af..89be1bd180 100644
--- a/core/fxcrt/cfx_seekablemultistream_unittest.cpp
+++ b/core/fxcrt/cfx_seekablemultistream_unittest.cpp
@@ -15,7 +15,7 @@
 #include "third_party/base/ptr_util.h"
 
 TEST(CFX_SeekableMultiStreamTest, NoStreams) {
-  std::vector<CPDF_Stream*> streams;
+  std::vector<const CPDF_Stream*> streams;
   auto fileread = pdfium::MakeRetain<CFX_SeekableMultiStream>(streams);
 
   uint8_t output_buffer[16];
@@ -25,7 +25,7 @@ TEST(CFX_SeekableMultiStreamTest, NoStreams) {
 }
 
 TEST(CXFAFileReadTest, EmptyStreams) {
-  std::vector<CPDF_Stream*> streams;
+  std::vector<const CPDF_Stream*> streams;
   auto stream1 = pdfium::MakeUnique<CPDF_Stream>();
   streams.push_back(stream1.get());
   auto fileread = pdfium::MakeRetain<CFX_SeekableMultiStream>(streams);
@@ -37,7 +37,7 @@ TEST(CXFAFileReadTest, EmptyStreams) {
 }
 
 TEST(CXFAFileReadTest, NormalStreams) {
-  std::vector<CPDF_Stream*> streams;
+  std::vector<const CPDF_Stream*> streams;
   auto stream1 = pdfium::MakeUnique<CPDF_Stream>();
   auto stream2 = pdfium::MakeUnique<CPDF_Stream>();
   auto stream3 = pdfium::MakeUnique<CPDF_Stream>();
-- 
cgit v1.2.3