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/fxcrt/cfx_seekablemultistream.cpp          | 4 ++--
 core/fxcrt/cfx_seekablemultistream.h            | 3 ++-
 core/fxcrt/cfx_seekablemultistream_unittest.cpp | 6 +++---
 3 files changed, 7 insertions(+), 6 deletions(-)

(limited to 'core/fxcrt')

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